Merge "Correcting sort order of languages for non en-us locales"