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

Change-Id: I991c16691fd65d3d45633c2dd105f84e720fca5d