Merge "Fix PartialWakeLock regression" into rvc-dev am: 4eb0a11720

Change-Id: Ib1c8ca6e05f20a1750650bd3ab9863f172199d60