Merge "Convert CpuPowerCalculator to work with BatteryUsageStats" into sc-dev