Merge "Replace Locale#adjustLanguageCode with its own implementation"