am 5273d502: am 216442e6: Merge "metricsd: Fix unit tests."

* commit '5273d502b829239b67531d1c5fd25876ff604387':
  metricsd: Fix unit tests.