Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev