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

Change-Id: I9951e1a717650535e66590faad3a88040cba9f20