Merge "Move LocaleList to avoid layering violation." into nyc-dev