Merge "Implement KeyMint2 test for VSR13" into tm-dev