Review Request #12082 — Created Feb. 24, 2022 and submitted
This change removes a bunch of unused imports, and fixes up a handful of
places that we had imported things from one module which really ought to
have been imported from another.
Ran unit tests.