Merge "[automerger skipped] Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b8a am: fa98e6522d am: 59b194f6e7 -s ours am: baa972f2bc -s ours am: 906373e9b3 -s ours am: 2e31bb7b91 -s ours am: c6b82ef2d0 -s ours am: 457f71b383 -s ours" into main