Merge "KeyMint VTS: add TEST_MAPPING"