Merge pull request #23551 from eileenmcnaughton/import_no_go