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

Change-Id: I44b1482a6b47bb8ca37fbd7897791a07ad5e182a