am 43ce9b20: Merge "Set mGotCountryCode properly."

* commit '43ce9b204ebedbd0d3a3ad24048f081b9b9f854d':
  Set mGotCountryCode properly.