Merge "Sync up measurement atoms to match internals" into udc-mainline-prod
tree: 15ffc7bb8127b326b684ee22af421ad5d07ff275
  1. stats/
  2. OWNERS