Summary:
X-link: https://github.com/facebookincubator/Glean/pull/482

X-link: https://github.com/facebookincubator/zstrong/pull/1147

Reviewed By: josefs

Differential Revision: D68326697

fbshipit-source-id: 4aaebfe64b6b481ae1c8857f850c722507be4ff2