Merge "KeyMint VTS: strict test only for v2+"