Merge "Migrate Statsd to the apex"