Bug 1026537 - Fix remaining incorrect semiauto imports