Merge "Fix a deadlock in statsd."