Merge "Log unexpected EnergyConsumer results"