Merge pull request #19270 from eileenmcnaughton/import
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 24 Dec 2020 00:05:19 +0000 (11:05 +1100)
committerGitHub <noreply@github.com>
Thu, 24 Dec 2020 00:05:19 +0000 (11:05 +1100)
Fold deprecated function into the only function that calls it


Trivial merge