Migrate maps and sets#39264

Merged

rbuckton merged 4 commits intomasterfrom

migrateMapsAndSets

Jul 13, 2020

Commits on Jun 26, 2020

Migrate more places to use Map/Set
rbuckton
committed

Commits on Jul 7, 2020