upstream changes for msm-sleeper

Signed-off-by: cj360 <ayunker551@gmail.com>