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

* commit '956818aa0210ffe5bb36943bb79377a672beab74':
  metricsd: Fix style issues.