merge power management from @mikeNG

Change-Id: I3601df5c154be04562472a0736ceed61d412f5b3