Merge "metricsd: Remove dead code."
am: 695da48944

* commit '695da489440335ef41649eece4dc4ca5eca3b28a':
  metricsd: Remove dead code.