Merge "Disable statsd that was accidentally enabled in ag/3480570"