Merge "power: power supply framework : add warm and cool properties"