Merge "[statsd] Eliminated extra kernel call during hot path" into main