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

Change-Id: I723a6265061ff743a519d0b12e1c957b872a1c49