Merge "Continue supporting persisting country code" into nyc-dev
am: ff6f114971

* commit 'ff6f1149718d709ce4799883af4d77251c2652dc':
  Continue supporting persisting country code

Change-Id: I7b5e7e7ce04a1518652ec5be3333fae4fc0c08d2
tree: fecbcec8a0b2e949342c5fb841cc026b322fde6c
  1. service/
  2. tests/