Merge "Delete References to Statsd in StatsManager"