s2w/dt2w: Fix deep sleep issue

Change-Id: I667f7df0e6d6448dbe29b6c9b28fd1cd355f4612
s2w/dt2w: Code Cleanup

Change-Id: I4532e6cdee40951af57b62386770e8f56f4dacd7