First set of power management changes from ICS