Merge "Turn off CFI for other Keymaster VTS versions"