Merge "Statsd - use AID_STATSD in MetricsManager"