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

* commit 'ed90f782119a11809cb642d9aa28c465a16a4239':
  Continue supporting persisting country code

Change-Id: I7b5e7e7ce04a1518652ec5be3333fae4fc0c08d2
tree: 3a19b9e0f161f303dd5c8cb783c9c5a05673387a
  1. service/