am 9c9adaf7: am 956818aa: am ad550645: Merge "metricsd: Fix style issues."

* commit '9c9adaf75851ee8e407a2d6f72a95eb9864547a1':
  metricsd: Fix style issues.