Revert "Revert "Upstream changes for msm-sleeper""

This reverts commit 94499f6f007f999565853065259d19b3ff82e2f8.