Merge pull request #23342 from eileenmcnaughton/import_map