Fix crash on Import/Export on SDK18

Merged username-removed-65452 requested to merge fixpicker into master