TEST-3 #resolve

Test Plan: karma

Reviewers: albertkang

Reviewed By: albertkang

Differential Revision: http://178.62.60.45/D21
Merge commit 'f8261b00d33eacc0ff52342ecdce386051fe1ba7' into HEAD