am 734ccfbc: (-s ours) am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '734ccfbc7b29a136e09e6a2ae788673fbd52f3b4': Don't reset country code once it is persisted
This commit is contained in: