PowerManager: Bring inline with cm