Merge "Rename MeasuredEnergy to EnergyConsumer"