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

* commit 'c39b9a4dc4661baab1ed638cffdc985ccbd4afb6':

Change-Id: Ie1685c50a286f1ee204609d7b2f789c5d05c5d40
tree: c17d330ad0d085a3416fcdb3168a48b08c346a90
  1. service/
  2. tests/