Merge "Fix typo in TEST_MAPPING" into rvc-dev