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

Change-Id: I56f8d7871149412747b708667c089045ff14451e