Merge "Small fixes to PowerProfile and ModemPowerProfile"