Reviewed By: @jingc Differential Revision: D2437502
Reviewed By: @foghina Differential Revision: D2434588