Merge "More KeyMint VTS testcases"