Merge "Batterystats logs smeared power model values" into oc-dev