Fixed wakeup logic and enabled boot waiting till a user is available

Change-Id: I896222468b873228a26f674181cad8a1f26640dd
REmoved unnecessary stuff

Change-Id: I91aaca572a7c7d1db08c58ecac0a7bb57f70d91d