Merge "Utilize measured cpu batteryconsumption in CpuPowerCalculator" into sc-dev