Merge "Add presubmit TEST_MAPPING"