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

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