Merge "BatteryStats: Remove reading of cpu power" into oc-dev