Merge "Fixing VTS tests after IKeyMint breakage"