Merge pull request #23556 from eileenmcnaughton/import_depot