mach-msm: squashed msm_pm_wait reverts