Merge pull request #23484 from eileenmcnaughton/import_get_type