Merge "[automerger skipped] Merge "Revert "Update checkKeyIntent"" into sc-dev am: 2c0bd83b8a am: fa98e6522d am: 59b194f6e7 -s ours am: baa972f2bc -s ours am: 2c98139201 -s ours am: 2a3051a7c2 -s ours am: a96b9a3577 -s ours am: 63bf3bcaec -s ours am: c5cf064da3 -s ours" into main