Merge "Set mGotCountryCode properly."