Fix OrderedDict import
Merge pull request #16450 from rallytime/fix_orderedDict_import

Fix OrderedDict import