Merge "metricsd: Cleanup metrics names."