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

Change-Id: I731d6a85ee60e82ce2941d681eb692a14c91e189