Merge "Add TEST_MAPPING for ExtServices" into rvc-dev