Merge "Turn off CFI for the Keymaster VTS"