Merge "Remove TEST_MAPPING entry based on go/a-unit-tests update"