Merge "Revert^2 "Migrate Statsd to the apex""