Merge "Add TEST_MAPPING for Connectivity"