Localised the imports for upgrade cli.

12 jobs for migration-fix-cli-imports in 41 minutes and 58 seconds (queued for 5 seconds)