BZ-1008859 - External imports are blank

(cherry picked from commit da196ca29cc5bb5d0fa02e0efa6628cca54d4296)