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

Change-Id: Ib418be1236695b70e014bb089c621b853d019ede