Merge "Comment out Statsd tests"