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

* commit 'ff6f1149718d709ce4799883af4d77251c2652dc':
  Continue supporting persisting country code

Change-Id: Id00c1f589851c66896e6a1f54fcf8cf64a120707
tree: d100f29481c11f2fdd6142a7243e15ab1d0fa960
  1. service/
  2. tests/