Fix up the import path after #3332.
Merge pull request #3342 from rpaquay/fix-unittest-after-big-rename

Fix up the import path after #3332.