Merge "Prepare TEST_MAPPING for presubmit tests"