Merge "resolv_integration_test in TEST_MAPPING"