am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
  Remove bogus 2 char limit for locales and countries.