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

* commit 'ad550645944051f2fb71a599b10cf08e84474035':
  metricsd: Fix style issues.