Review comments of reducing sleep and handling restart checks implemented.

Change-Id: I48ace83f7b264b875f56f5f6853ef8d994395df3
Merge "Review comments of reducing sleep and handling restart checks implemented."