Differential Revision:
D21918702

Original commit changeset: 3213e9536147

fbshipit-source-id: 4e9394b2026f0d6d74e668c7c72b3612a42770ea