Merge "msm: pm: Rearchitect power management code"