Merge pull request #23636 from eileenmcnaughton/import_contact_type