Merge "Calculate total power for a BatteryConsumer by adding up PowerComponents" into sc-dev