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

* commit 'ce7c5718ed89231f6cc1edb347e62f6e3d9c5cbd':
  metricsd: Fix unit tests.