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

Change-Id: I5853a3382a24c9cd4fe6e62bb2e323feafe31380