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

* commit '2585e15ef722c7bd8c320e57ded8ad67da121245':
  Don't reset country code once it is persisted