Summary: As requested by David to improve reliablity on aggregation metrics
Differential Revision: D36877430
This pull request was exported from Phabricator. Differential Revision: D36877430