RC: Wakelock blocker (2/2) - Squashed

Change-Id: Ie319d6db8032c42238b3576828c2e0970a52812d