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

* commit '72685ffc23951cec1854a90642aaa9b807242ebf':
  metricsd: Cleanup metrics names.