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

Change-Id: I0f5caef7262a4864c17cb125a1ae65c9d13d67a8