Merge pull request #17738 from colemanw/upgradeLocales