Merge "Fix statsd ASAN failure"