am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev

* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
  Don't reset country code once it is persisted