Merge "Fix failing statsd unit tests"