Merge "Update TEST_MAPPING imports for connectivity"