Merge "Statsd cpu optimizaton" into pi-dev