Merge "Fix getISO3Country and getISO3Language."