am 7763dd6b: am 72685ffc: am 2bd33b3c: Merge "metricsd: Cleanup metrics names."

* commit '7763dd6b4b9915d453b1bb1dd0c1e0247672e5a2':
  metricsd: Cleanup metrics names.