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

* commit '457fcbd81fa73b626a05e833a210589255628b88':
  metricsd: Update to use new component/trait APIs from weaved