Wakelock Blocker [2/2]

Change-Id: I107bec97fd759b9b85ee241628f9a35e022a22c7
Merge "Wakelock Blocker [2/2]" into du44