Merge "Fix LocaleInternalsTest." into lmp-dev