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

* commit '74f6f8c323a99586316fb1c01452fefadb3f9b5b':
  metricsd: Make the unit tests pass.