Merge "Revert "Fix Build:  Revert "Implement locale matching in LocalesList."""