Merge "getSimLocale should return locale rather than string tag"