Merge "metricsd: Remove dead code."