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

* commit '827f64625ed03d69543953f48a39e70b85ee3255':
  metricsd: Make the unit tests pass.