Merge "Make getLanguageFromLocaleString private"