Merge "metricsd: Update to use new component/trait APIs from weaved"
am: 919af692c5

* commit '919af692c58c1aab5081a3cbf48e88e744094dae':
  metricsd: Update to use new component/trait APIs from weaved