Merge "Partial revert of keyguard checks" into rvc-dev am: 2a3c62046c

Change-Id: Ief8c04d6a677964bbe1584481a80775a9323382e