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

Change-Id: I85770a4c8788af5b9b4b0385e2544dd11c2e99bd