Be more conservative, still track external fields
Be more conservative, still track external fields

Reviewed By: minjang

Differential Revision: D20019784

fbshipit-source-id: 0fccb8aaeb21a71d3731a54a112db1bc04ba8ebd

facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex