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

* commit '2bd33b3c2a498650c773db2f6ebaffabc0783cd8':
  metricsd: Cleanup metrics names.