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

Change-Id: I545c356b1fbc717640d9792d9cb3d1d9f3150ab7