Merge "Use LocaleList to support multi-locale to improve name "bucketing"."