Merge "metricsd: Fix unit tests."