TEST-1 #resolve doing this again

Test Plan: mocha

Reviewers: albertkang

Reviewed By: albertkang

Differential Revision: http://178.62.60.45/D12