Merge "Batterystats logs smeared power model values" into oc-dev am: 513fba2925
am: d7b8a387b8

Change-Id: I1063ac7dd3d9f8d49ae5be63f3852b5001abd26f