Merge "Statsd pulls on-device power measurements"