Merge "Use ICU Localization for country names in settings." am: 1cefb73fd6
am: 6c71a6d953

Change-Id: I14de7329c9730e17cb1a8fc1ca03d05e98a9c61d