Merge "metricsd: Fix style issues."