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

* commit '216442e61b667f041f35af8080c7a3625e50f122':
  metricsd: Fix unit tests.