Fix all in file for import fix #20315

Issue tracking #14549 for the import fix case. This will be more difficult than others because we'll need to add code to keep track of the imports we're about to add so they can be combined.