Merge "metricsd: Split into two daemons."
am: f3f2c63adb

* commit 'f3f2c63adbc8b123d3de6adfed3362fa9aabc9e3':
  metricsd: Split into two daemons.