Merge "Make batterystats logging readable" into pi-dev am: 36a2324a92
am: 8828fd1266

Change-Id: Ic81d28df2e6c6ec32b6ada4710f23287a13e0314