Merge "Follow class package change: LocaleList" into nyc-dev