fix T7 merge conflict

Summary: fix T7

Test Plan: none

Reviewers: ying.zhou

Reviewed By: ying.zhou

Maniphest Tasks: T7

Differential Revision: http://115.28.35.38:8080/D15