Merge "Fix RKP support assumptions for keymint VTS"