Merge "fix ActivityMetricsLogger counter names"