fix sleep / resume issue

Change-Id: I4332a6c4e7f311c7e5c41a7b15b1eae6a61e0417
Merge "fix sleep / resume issue" into kk_2.7-stable