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

* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
  Don't reset country code once it is persisted