Merge "Revert "[Bugfix][API-660]reboot after sleep problem"" into MR3.0