Merge "Update LocaleListTest to accept repeated locales." into oc-mr1-dev