Merge "Simplify SystemServicePowerCalculator" into sc-dev