am 21c04920: am 827f6462: am 74f6f8c3: Merge "metricsd: Make the unit tests pass."

* commit '21c04920dce8aeadc82d79a55bb6270b8b79ae8f':
  metricsd: Make the unit tests pass.