Revert "Upstream changes for msm-sleeper"

This reverts commit da54c6b3d4f317cc07471b56383aa13d6b73be20.
Fix build