Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev