From e7db004747140adde1b146626e0588ef63ee94f7 Mon Sep 17 00:00:00 2001
From: Lara Scheidegger <lararennie@google.com>
Date: Fri, 16 Mar 2012 15:59:09 +0000
Subject: [PATCH] JAVA: libphonenumber v4.7. Mainly metadata updates.

---
 .../i18n/phonenumbers/PhoneNumberUtil.java    |  16 +-
 .../data/PhoneNumberMetadataProto_AC          | Bin 252 -> 256 bytes
 .../data/PhoneNumberMetadataProto_AM          | Bin 624 -> 629 bytes
 .../data/PhoneNumberMetadataProto_AT          | Bin 1103 -> 1102 bytes
 .../data/PhoneNumberMetadataProto_AZ          | Bin 1022 -> 607 bytes
 .../data/PhoneNumberMetadataProto_BF          | Bin 418 -> 427 bytes
 .../data/PhoneNumberMetadataProto_BR          | Bin 797 -> 888 bytes
 .../data/PhoneNumberMetadataProto_BY          | Bin 767 -> 766 bytes
 .../data/PhoneNumberMetadataProto_BZ          | Bin 423 -> 410 bytes
 .../data/PhoneNumberMetadataProto_CR          | Bin 567 -> 612 bytes
 .../data/PhoneNumberMetadataProto_CU          | Bin 475 -> 476 bytes
 .../data/PhoneNumberMetadataProto_DE          | Bin 1694 -> 1923 bytes
 .../data/PhoneNumberMetadataProto_DJ          | Bin 410 -> 329 bytes
 .../data/PhoneNumberMetadataProto_EE          | Bin 846 -> 845 bytes
 .../data/PhoneNumberMetadataProto_EG          | Bin 810 -> 862 bytes
 .../data/PhoneNumberMetadataProto_ET          | Bin 986 -> 985 bytes
 .../data/PhoneNumberMetadataProto_GA          | Bin 611 -> 610 bytes
 .../data/PhoneNumberMetadataProto_GH          | Bin 463 -> 553 bytes
 .../data/PhoneNumberMetadataProto_HK          | Bin 524 -> 540 bytes
 .../data/PhoneNumberMetadataProto_HN          | Bin 499 -> 510 bytes
 .../data/PhoneNumberMetadataProto_ID          | Bin 1103 -> 1478 bytes
 .../data/PhoneNumberMetadataProto_IN          | Bin 4018 -> 4012 bytes
 .../data/PhoneNumberMetadataProto_JP          | Bin 5124 -> 5117 bytes
 .../data/PhoneNumberMetadataProto_KE          | Bin 561 -> 626 bytes
 .../data/PhoneNumberMetadataProto_KG          | Bin 715 -> 714 bytes
 .../data/PhoneNumberMetadataProto_KH          | Bin 617 -> 616 bytes
 .../data/PhoneNumberMetadataProto_KR          | Bin 1406 -> 1447 bytes
 .../data/PhoneNumberMetadataProto_KW          | Bin 611 -> 613 bytes
 .../data/PhoneNumberMetadataProto_KY          | Bin 566 -> 598 bytes
 .../data/PhoneNumberMetadataProto_LB          | Bin 550 -> 546 bytes
 .../data/PhoneNumberMetadataProto_LU          | Bin 1506 -> 1504 bytes
 .../data/PhoneNumberMetadataProto_MA          | Bin 769 -> 775 bytes
 .../data/PhoneNumberMetadataProto_MD          | Bin 661 -> 660 bytes
 .../data/PhoneNumberMetadataProto_MK          | Bin 632 -> 635 bytes
 .../data/PhoneNumberMetadataProto_NA          | Bin 882 -> 881 bytes
 .../data/PhoneNumberMetadataProto_NE          | Bin 484 -> 483 bytes
 .../data/PhoneNumberMetadataProto_NZ          | Bin 857 -> 866 bytes
 .../data/PhoneNumberMetadataProto_SA          | Bin 660 -> 659 bytes
 .../data/PhoneNumberMetadataProto_SB          | Bin 402 -> 413 bytes
 .../data/PhoneNumberMetadataProto_SC          | Bin 525 -> 414 bytes
 .../data/PhoneNumberMetadataProto_SE          | Bin 2329 -> 2328 bytes
 .../data/PhoneNumberMetadataProto_SL          | Bin 363 -> 358 bytes
 .../data/PhoneNumberMetadataProto_SN          | Bin 443 -> 433 bytes
 .../data/PhoneNumberMetadataProto_UZ          | Bin 1839 -> 1838 bytes
 .../phonenumbers/AsYouTypeFormatterTest.java  |  12 +-
 .../phonenumbers/PhoneNumberMatcherTest.java  |  21 +-
 .../phonenumbers/PhoneNumberUtilTest.java     |  59 +-
 .../phonenumbers/ShortNumberUtilTest.java     |   8 +-
 .../phonenumbers/TestMetadataTestCase.java    |  50 ++
 java/release_notes.txt                        |   9 +
 resources/PhoneNumberMetaData.xml             | 761 +++++++++++-------
 51 files changed, 575 insertions(+), 361 deletions(-)
 create mode 100644 java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 883a676ee..9ae038069 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -63,6 +63,9 @@ public class PhoneNumberUtil {
   static final int MAX_LENGTH_FOR_NSN = 16;
   // The maximum length of the country calling code.
   static final int MAX_LENGTH_COUNTRY_CODE = 3;
+  // We don't allow input strings for parsing to be longer than 250 chars. This prevents malicious
+  // input from overflowing the regular-expression engine.
+  private static final int MAX_INPUT_STRING_LENGTH = 250;
   static final String META_DATA_FILE_PREFIX =
       "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto";
   private String currentFilePrefix = META_DATA_FILE_PREFIX;
@@ -261,7 +264,7 @@ public class PhoneNumberUtil {
   // plus_sign*(([punctuation]|[star])*[digits]){3,}([punctuation]|[star]|[digits]|[alpha])*
   // Note VALID_PUNCTUATION starts with a -, so must be the first in the range.
   private static final String VALID_PHONE_NUMBER =
-      "[" + PLUS_CHARS + "]*(?:[" + VALID_PUNCTUATION + STAR_SIGN + "]*" + DIGITS + "){3,}[" +
+      "[" + PLUS_CHARS + "]*+(?:[" + VALID_PUNCTUATION + STAR_SIGN + "]*" + DIGITS + "){3,}[" +
       VALID_PUNCTUATION + STAR_SIGN + VALID_ALPHA + DIGITS + "]*";
 
   // Default extension prefix to use when formatting. This will be put in front of any extension
@@ -1623,9 +1626,13 @@ public class PhoneNumberUtil {
     } else {
       // Invalid region entered as country-calling-from (so no metadata was found for it) or the
       // region chosen has multiple international dialling prefixes.
+      LOGGER.log(Level.WARNING,
+                 "Trying to format number from invalid region "
+                 + regionCallingFrom
+                 + ". International formatting applied.");
       prefixNumberWithCountryCallingCode(countryCode,
-                           PhoneNumberFormat.INTERNATIONAL,
-                           formattedNumber);
+                                         PhoneNumberFormat.INTERNATIONAL,
+                                         formattedNumber);
     }
     return formattedNumber.toString();
   }
@@ -2737,6 +2744,9 @@ public class PhoneNumberUtil {
     if (numberToParse == null) {
       throw new NumberParseException(NumberParseException.ErrorType.NOT_A_NUMBER,
                                      "The phone number supplied was null.");
+    } else if (numberToParse.length() > MAX_INPUT_STRING_LENGTH) {
+      throw new NumberParseException(NumberParseException.ErrorType.TOO_LONG,
+                                     "The string supplied was too long to parse.");
     }
     // Extract a possible number from the string passed in (this strips leading characters that
     // could not be the start of a phone number.)
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC
index fbb7a91402f26e2fa2e96208922749bb0369786c..52de7be796a8e5c728c7dd3c7fb3f826a0da0c3e 100644
GIT binary patch
delta 73
zcmeyv*udnt<}Cwj`7Z_r21Z6k2A*gmT@y3&*qD@R<61@rRv>Ls3zT6{(6F~MjyBLW
Zjjb_>HqkYUt%)`=11hUAH<)O<9{{<J6Mp~z

delta 69
zcmZo*`on0u<}Cwj`8Ngz21Z6k2JUDhT@$m|n3QVcT1Ey|AZ=0$lwgq6u(vXfHqbSV
Utucu<(KU;$i8cZ$o9MV70B&FsT>t<8

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index c6a51446780f3820dda7e61e33b6f4e6199bd8e7..54618677dc86d1381971e3b86732941117e449ee 100644
GIT binary patch
delta 70
zcmeys@|8tv&07Z6Dh39o90mpkMn*;ku4qGD%h;HdYV%q~26iBAs$)?Llwt6isB6z!
WV`3hYvN0!;k(I>|$ew(haU}p@77^0`

delta 64
zcmey$@_|Kn&07Z6Dh39obOr_nMn*;k-e^NzV^dwr*qD@R^IAp*b|7u4V^Ir~WN@9R
RWxp{ml97qgaPk?(l>qno56=Jq

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index 35684449c1f77f40eb337f683523bc19d82b1854..751674c43b0bac8f39d83068588b2276a5f46550 100644
GIT binary patch
delta 23
fcmX@lagJkxE~EZLJ(-Q(`<R)d%bh3lus8z%UZn>y

delta 25
hcmX@dah_v>E~CLjJsC!mjb8hhnaf?GCv&qn0|01G2W9{O

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 75b798b79455a32809a4063d87f8d8c5c6219ada..34d4f940c31ffc84a2440efa9bbd805a9c0ad240 100644
GIT binary patch
delta 166
zcmeyzexId&&07Z6Dh39oFa`z&Mn*;ku4qGD%h;HdYKvM%26iBAu47pXlwq*Yu(vXd
zHnIT9)ffTU21YeNu1Rc-QM8dRkTN!|i8e8fHL5X-HZqRYtT8q-)dXrcLo$Yufz!~)
w7>G<v&44D#0ZrjIi8cUgHjOqgG>xq>Gnnkh_>qx$vIA4*WM3xb$*Y-z0cvL{od5s;

literal 1022
zcmbtTOHRWu5S_Fts1&hBAhnAu8mW=&@h1+Osu$n@nCv(Ob#KI}*t2B8jyFl9q*RrV
zTBROm#_!F{^W@`;X75DPZz9UFjBcYY>*n=sUv0u6qigKkramA>KkMz2#vf1QfHSEs
zuqaMCs?vqJNhTT>nq;HWrmWy_h*;V9sMuH!?o`3YwhT>?7+i`$BD@U0fI0atA`ZbC
zSmW9VsxwYVievzhh$Mtz3qIS?Xtqv(QClx*+_Bpg$%_YhL7>q~iq7L)RfE>MEdth}
zb3UNKy&LI}(Ok2^W1WX251@(GH%c1SC=tC?jeshEX0SEv+#-n}DnPD7_!|yk2rp`-
zSScJaV}{O)V_=v(@7hJ~<dXfJh^`_?o20qu>Xocht@N0iCc77m$R|ydqKvYB!NkxN
zJ+4tJgc4&q)4##cBG;>&SGif`Rwj&=$f;#~+Pja|H7vJhM1DvwRjgI6VeuPt52Ss<
zQ|<}#CGZ=AAuZb(J)*fET5G!;Dmg7-iBF*)eVJ|PFXCNhvBG-3y?;nIi}KOndZ5oB
P&k69XJXt-$io8U>TP@R#

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 802997eed50131f7792b24dcf00442e926a2c02e..ad53ba8d29d3716ec30852f60d572ad6692d96d7 100644
GIT binary patch
delta 45
zcmZ3)yqcMF&07Z6Dh39|MH4y8g`G6)t;~SfAlg9JIJU+jCPi~%w;ZG8#Fak*Bo_^`

delta 62
zcmZ3@yoi}|&07Z6Dh39|nG-q7H7zylt;`If4RnoTYs`V{Xagf%GmF@mlo~^zpoy7<
NB~Tp5GMl*RCjc5c5)=Rc

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index 31ed9bc751ca25c82e0af7b9e77220e9c731a464..96d2ae4e6681709be91306d31f8ba29a3d28b1c6 100644
GIT binary patch
delta 231
zcmXAjJ#NB45QS$9;jd3Y6&DM5C9mXJukBqL7rp=mqA~8Ej?xnEA&~3bAoRHo2cS=x
z*-*^9_cZ!O?`!fqG2ah(xd4pb0RRzU*^)A)a^3OtS*4WuzF=ol=MiTAj_A7SG;v-K
z>D&}$WgU|rl+@cWMVp(d>)TRU{?a?9DAoRY+t260XDQJz#TC+^FyVc`JFW*Cz3uqo
yrK}Mmp}7!@;Wc4Idl{s7it!R=f?}bS$U|)y5jli$B1m$pEEY`@hXBJl`uPK{ZZi}B

delta 140
zcmeytHkVC(&07Z6Dh38-5e5bZMn*;ko@hf|%h;HdYI7aST1EyAAj?9>&|soTtfm2w
z&t+(6WNcz;W^Q2#RGeX`VQ&S((Pm&xHKx(VCg!md4~MX^0W}&LOjcl2Wi*)V#;5@#
g^BEs9Do+k%lIN?{)U;=0U{WyxTFSsY`2f=n0L5}33;+NC

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index 284b3b32faf8e86d04bcf93611ae370be3c4f1fc..a78037b199fe5f159d61cd64fdd6585f2c7db56e 100644
GIT binary patch
delta 28
kcmey*`j1t3&07Z6Dh39ouM7+fjEsy7;?ag1MP4%j0DT1qf&c&j

delta 29
lcmeyz`kz%~&07Z6Dh39oZww3!jEsy7648c68--sp0RV&h2etqJ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index b1f0a8839e4584cb18dc42ff5b552016b42e5651..0b04b15a6cf171ef7e51ecf105da8771a8d099c8 100644
GIT binary patch
delta 35
rcmZ3^Jd2rg&07Z6Dh39|i4!@)d3nvE4Rnpo%wuCxs!cam=`sQUuh0p)

delta 48
zcmbQmyquYH&07Z6Dh39|c@sIqrKHR>?5&~=bd6(UQfi{j%wwYs3}ZE8QmRch=ISy6
E07;t-ssI20

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 307c8abfc47c508ea0a5faa3fa24f66a1ae0c36c..de374d1010ff80a0421277f78b75e85eb1fc8f4a 100644
GIT binary patch
delta 100
zcmdna@`QzR&07Z6Dh39o=!u-~CDM!x4WbQn&0=Fxs!eKZObj&at)dM~VkiE$5U()@
vN*RJ=jB7P(ObrbTz=|eYFy@L$X&71pm4fsdnV4C`))-pWn3+x9%Gd+|33MI%

delta 56
zcmaFDvYmx<&07Z6Dh387y@{Of+3igXH0-SmCJQiHFltVYXUr84(J-_G2}K*|8pYNa
KT26k%*aQHsaSsas

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index ec56f92eb37820aa80435b9569d4180c5ffddb9b..4ff335130ae858370765f5de597e5f1f7fd6a054 100644
GIT binary patch
delta 28
kcmcc3e21BH&07Z6Dh39|%NsfQ8Cls44WdmZ%P{T-0DeCQ=l}o!

delta 27
jcmcb^e4Ckb&07Z6Dh39|OB*@)8Clp24WcK@GVTWecH9TD

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index 673ba16f5d2f1e9b5386e8a1613b698472799c26..9163e1b0fdf71ed36716ce443305d0ed83dc9b67 100644
GIT binary patch
delta 265
zcmbQo+swbAfXPJ4&_cuB$}lFS+EmBTu(l@JNY^qJ$g`-`WMtp~F?0+~Y8e^04J}L!
z3=EBoO-#)uS2B4sa&JD$B+1BH#lXN^I{6;6_GUho2&Q@=4UkbrwVE0*6EzuFRSXqW
zj2IXg7#WxiEewIAfeMfW0s##}3!pk<h;p-96t%2i8!=Tw4L3(s&1Ps3ZDyeti=>_x
YY&zH_K;IxcgA=IONY~VSawMB802*;LO#lD@

delta 47
zcmZqXpU1nQfQggI&ykS<NH9!Z!sN}!zWD=_B;#a07H!rl1_q`Hn=M%)m?nF(TL1tN
CB?}(_

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ
index 0683a643123806be45cd89185cf811434bebe5db..68133054d55ff9baba230e0ed92b808d18842f41 100644
GIT binary patch
delta 117
zcmbQme3B`B&07Z6Dh38d2L>R)$jHDMZDbxBlTvM7%gDeAq%CTJ!VKa@8unI((MGza
yu{Gw=CO}dXC}#>+!^ps4WN2(=U|?VjRLx^<9&M&;0Wt=rWMa<}M#jmpjJ5zM-W!Gh

literal 410
zcmcJLF%H5o3`Lzt6_sFNU}NZzp_N+XBu!JXR7gw=Tp)Dg6wn@mdvG<5fP|BR)Es~)
zvK{-`-^%j^$qj%#fDB`>a<Xds%k^$bJ2F^M)RgT=HQ43dUOF`W;8bOZDX3VFg9>?{
z8mz0y`n;JnGf0)x4I*k9vnJfyqI1nxC?>6KwM3Le^7A1WFaD1>k<PX~gM{`~v;~)T
ut_1veqF;FfM<hQT4x2pSMeHCIG7~Bj+H)*ifNc!LFIfIsGEvXFCZ!Mf5=Jus

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 89ecb6ec044df49be393aa47ca063c402fa0c08f..5b8327611310db6fcf2dec9b256363d091ef9f1c 100644
GIT binary patch
delta 28
kcmX@dc9xBE&07Z6Dh38-myMi{8CgU$qK!9yWQ=750D+VUe*gdg

delta 29
lcmX@hc8-m6&07Z6Dh38-*NvQy8CgX&qK!>9e_)Jd1OSO=2(<tJ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index e827816835220f3083ad5d6a8c0da8299ec97e1c..463aaa69cce117099171a75cc86549c055f61977 100644
GIT binary patch
delta 272
zcmXw!y$*sf6op#|By3Jj4w_&BD2bH*fH6Ax2u`&dFW@RAj?RR)FmCQXg|lzq3pjaO
za60Kd-#Pd8=D+>m{z2XuA@|S*+siZBt+ObXBv;2uGo!I4lB5*gHEDF-3k7ZkW2UrZ
zqEH6ZoW>?JSi)M?F=H+XO?go&XwU^Prj-FiCE<{T2BD}f>@E{1dj<$Nhbqm8g&4r%
z4*^%R_BF?w_M74KvA}zblkVh<aoSy-Dj7xg-q;9ViY7*0m`y{15W;AZ!HRtNWf!=!
E9|P`6*Z=?k

delta 237
zcmXAiF$%&!5Jh(l3TaZ<*oi`fY!S%LZZ?UcR$jn%GhI%hBc4Ihcm@$HypK2V0#@#B
zikX4`{$oCq$0UA!+4#g*w7kW;>pk1ArBx+bP)Oi++mUjk9Vsm28p)PbJrs-<R1QE5
zAmoCK1)ZC^K}EIW7QEnH4W20!)P%f5Amz#!;smJ*Jt5leY;M05-}DPE-$#DnGa<vP
nLYf9iTInsYMgJOg^CWWuT!cT>MX+%y7b!5tIGak<Z=>ZO@s&S@

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index b3bde00460ccbedcc0258a9909924f8f7d949771..15e0c7d7cb670c73758c1b5a068d4fdc1ff90057 100644
GIT binary patch
delta 26
icmcb`ev_SZ&07Z6Dh3AT3lljN8T%$`Pu#dymKgwgatPZ1

delta 28
kcmcb~ev6%R&07Z6Dh3ATixW8&8T%({Ph>ROxJQ;50E!?94*&oF

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index 438299c66e902c4ef43c07d50eaef09ef2e3a24a..fb204d0893b2e88d15975c84e9b66e659905711c 100644
GIT binary patch
delta 27
jcmaFN@`#0V&07Z6Dh39o$cdb-jI$>8mu+TajAaA>f?Ei(

delta 29
lcmaFF@|cBl&07Z6Dh39osEM4djI$^9moXY|W@U_J1OSrV2<HF*

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index aa6e8e773ffeafee139e01c97f19f6415969a9af..e268fcca6b1954632c348fa1f2439e2c2597abf1 100644
GIT binary patch
delta 178
zcmX@lyplz6&07Z6Dh3871qKENMn*;k!Du66)7Y4lYKz($3m|1aQRcP`hlPOwkZoGa
z$iNDgVq^db85$Xzm`-9W!7D$xmQk9KY4S`)6-S_Mu<48p%mylkj6fS1_%wj#8P{rp
bDAQU^238eA1r;NZTNoHEkko<HGB5xDPAwxN

delta 109
zcmZ3<a-Lac&07Z6Dh39|V+=rok&%HX+Q`^6HYTOoOvhrP;_b=Cj5d?)8C53dGs>zm
v`8hH&00{;LCU*~@`j-q$1_lg_42)0$D8#@x`3R$m5KxfWK*f*|Bmw~d@6-|b

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 9e5fa06a3a4a6ba24ca4ae62a964657422dfb9cb..0b3561a80d9d8c989950de2c64162a146cd6bcec 100644
GIT binary patch
delta 59
zcmeBSnZv@l<}Cwj6$1m4@I=lq7OrShvxzCQq}a@3QmV~s85vlCv;~mnFgG+ZHZe6b
MpZH#SvJ&Gf0LWnv-2eap

delta 41
vcmbQk(!;{J<}Cwj6$1kk^F+=tR_<t1UGs^_vpAXj92psa1jA-=Mpi}u(jy4g

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 9339afbcb6b30b4cbab7af546b6592ac8a914380..c6dfaf9272cb60b3b3e8d8516f8c938e3c4de4aa 100644
GIT binary patch
delta 42
xcmey&{EwM)&07Z6Dh39|uM;^H81GNi(&o2_HZU|X)3uDPu>`V=Hb%~31OO<_4F>=K

delta 31
ncmeyz{F#|^&07Z6Dh39|R}(oE7_Us!(q^%YHZa_nGK&!atm+CP

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 5c45880c4004429b666111520ea6b130cbae81bc..fc2cd499f7afc8219c8268c7c4e21501a82ce2c3 100644
GIT binary patch
delta 426
zcmX|-J5B>Z5JWx5NJzd2gLb6(e;^>?00d;sWKPJ5aIbs?ODhh7Ouz|9xdSJmdcXuL
z^>%f=s@<=P&&|PHz5C1CYlnxdsr_-g%Tt-T$uMgsA7xjjI_tNa2elm3{a!uc{A3H{
zV(J{py3UE5iMe&omMhtiFao7nu50B+&Zpcp!)0P`9I+3Xo70>yItmdM@*--^=u~i3
zAi)r_IA|Xl2o;NjcOXryavcO9uc5O?5JbcT@eH)|3b;c_iO&B^PgRJ;LX6^Y?YGSU
zB54Fd@lAYvu+i=>&m#^ad5J1TgEY`18bzdKJRv2D{rI*a6mmt{Yy9Oj<(Zdnbv%Dr
Pt<=Zy_3T+KoAuofvz~UE

delta 54
zcmX@ceV${2F5gU}XhS2D*qD@Ra~+G?jo~4Tj3$#;GX^j*2uu!R-aPp)GtXuzmJCLw
Ka+k?XtS$iC2@t0M

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index f07407afcd720f19c8a976cad13e67df9cb56a5c..6f1ad2831e276cda70f044b71d5cc6d14ea64cee 100644
GIT binary patch
delta 141
zcmdlazeaw7xsHy8y_KP1jZw6LQEZK|ag9l|fk|wQxus^bk*;}cOiHzRZH<KikYi$I
zzA<SwBcu7|e~ev>!qKMYu|QEX3(MFVvuGm|T~mw6i<r~74GfKSEn}+~7+4r4i?D<M
mm1nXnW#%@iWn^GB1PgDL<oLxrnV*l1706|tvRRI23Nru+!X)Yd

delta 161
zcmZ1@ze#?Axv7zcy_KP1jZw6LQEZK|ag9l|fk|wQxus^bk*-;6OiHzRZH<KikYfVl
z0X0lE;E~(dUChX6w)sC}7o(IZNU?=wY>ip8k%_LU1<-(KBV&-z<T=dg+*J$=EDQ#Q
u#=4fVllfRefVz@dmNG+xO==k#m<=}zbNpgv1*&77HMxdYdb2K1Ju?84m@7O0

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index eaae271cf1c1007b2f39be8df2eaf8a885b25680..e4032ead6d8fbe73f964f421db53ef2fa7195537 100644
GIT binary patch
delta 144
zcmZqC_^ZC*8XM!%$=BIjC(E*bWUHxSU|?aGEW+VAIgUe(an5E<zWa=V(MGx!v6?l;
z8unJ^K(<-zWE)<c$&0uGC*R{$o-EGI%lK!qCf_Gku;$G&JO>$p5?+ifK;7>dxlD8|
oV?pLJKbWi}a2zP(IoVjyfUnH3#t3Mjk#UV_w5jgqBEd;a0H5tEivR!s

delta 174
zcmeyX-lDPL8XM#C$%@=klRvU)Gn!16VgJZh#lXPAP%~MW!;{f;@&_(?j%Z_D^H@!$
zc|diaCX4aE6^J&{wTRWMG1joRG6%9vCl_+ngVh=^{sk&}#|k!Lav|r($*jCrz%t5{
z|M03avO<mc%LP=y{M<y>GPY*2tiW-&61B;?f(HEMhBZb&vyF^vOruS8EjDKhPGSN8
DY=br1

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index 197ff1edcdc43c6e09c4b14df0120a8182f3695d..a7c91d43fd8a0497f85ed2e8144f813e7a01f23d 100644
GIT binary patch
delta 239
zcmdnU@`<H>&07Z6Dh39oOa=x9Mn*;kF(ZSRlxi~_^V*td6J5(#Fvqf%k%0rqGSx9O
zs0Aux$U&$w(Xh9QHZU{>sRU^<GSM{yu}y(SXx5m5Wp$0sbS+?lKyyvO=9&WKwavf^
zAd*1ch9<h^5J`{=jKF4UGBU7(44jxCEn^W2RAU6Ptj09jK-V<3#vDRfM4L{WuD~u}
cVPF7s!o>Y5JOY+Lrh$>Jskue$#_v{)0IZNhGXMYp

delta 175
zcmeywvXLcW&07Z6Dh3874F(1VMn*;kF(ZSRlxh<l^V*td6J5(#Ajee4vX+s711xN4
zPzzMXprm1MWn@re5^bPs7F%N)lTu>_WEz1qXhO9!GO&YK6IV&gn8wyb8yXn{&8jg4
zDl>_#F$YpWQHyA^i4PSx1T72<qK!;UCvz~Wh)7rh%?9yxP0cN0YYYuzQZzSPFj_GJ
E05Q-kp#T5?

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 9384fb9a2c47d5380c16aa3e19ec4ebd4cc8e5ad..f71f076d82ef5f6c9a3285c0d94f998cf82a526b 100644
GIT binary patch
delta 29
lcmX@jdWuzK&07Z6Dh39ogA5D|jEsy7ywS#{8%4J<0RVKY2H*ey

delta 30
mcmX@bdYV;q&07Z6Dh39oLktWIjEsy7e9^|HW*bGeF#!O3O9vPL

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
index 3c8e5bd68feb6c127123b10d1e40b340fa18ff03..9e97693e0dd3e1f76b54989af6fb94d2ab45ac85 100644
GIT binary patch
delta 51
zcmaFK@`8nP&07Z6Dh39o_=%i3vN;;|RzPGJZJ=vxs%sfrV-{@&qRgWW%yc(SzQzau
DgH;a$

delta 52
zcmaFC@{)yf&07Z6Dh39ogo&Iva=9AzRzPGJZJ=vxs%sfrV-{@&qRgWW%yca_PP)bj
E0Fk^8Jpcdz

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index d8344af86636a84c67007a3b9934d216e62f0dfe..894849e85689baf6376ed1d856af5347f2adfbd3 100644
GIT binary patch
delta 65
zcmeyzwVZncCzC8U1G`2{O0{vVCIgd-Ap-*gBLkbEVYHEDEF%Nc<V0rS%>qmp7+I@;
U5;G?+WEPqHg;{hnA4>rv0ME}3pa1{>

delta 46
zcmZ3^{f}z{ClenRgQ!MKO0`j~CWx9`$RfTuoM{u|WIh&6)+z=D#)8e}ECq}JF;5IU

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index adb7f31efd2e65d8a5a136c8e89f8716eaed5195..cf386eeab999b496b22fb449f8e171de7112e9ae 100644
GIT binary patch
delta 38
scmaFN@|1;h&07Z6Dh39on2DUT1gbUctxSQ~Alg9J$kfbY<Hk*l0OHmQSO5S3

delta 36
qcmaFL@|cBl&07Z6Dh39osEM4j_$oE*txSQ~Alg9J$ZX^0O^g7}XA0*4

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index cacfd5fab3f3986ec0afbecc7fd20be3fa3547e9..dc864dda914ad380ab75b29163daff2cf60c4db0 100644
GIT binary patch
delta 153
zcmdnSa*c&^&07Z6Dh387--(=>j2RP+)j3U~jZJmUEn{mYMoF_on^?q7tg*KDFg7vO
zu(vWciZ;{*N`csh(PrkcHAc}u#j!Oe(Pp|9u{Gvqnl+Y4a>gLV#?fXIzg|<~1{z^u
jVi}WCZBom~zy_oZ4S)<Th_IoNvB~5;jM9_eGr9u+qZ2Af

delta 140
zcmcb{vW<mv&07Z6Dh387-HDu<j7bxX)s@Vm&2%keYs}3xYb-SEtqcrm45Lj<V{42|
zYfPdofHD>no2>2JjZI8}vc^Wy#=7P}K@bP1&deOBFxpfXNSOdB%UI1COR$U?NRd&r
Z3CL*U=!t)>aWeTiGBN-OhRI(TlK_)1Clmkx

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 255bc5f71d7baa6fa5041454bf97f7bc17e24166..6b2dba9cbecf736f1ab2ee5c24f8c0ae3125ebc1 100644
GIT binary patch
delta 89
zcmZ3+vWSIq&07Z6Dh387$%&jf5{er3R>m<YHReD%+Q2Xt$TS1e#vA*y8MUONEi7X}
TqHt-5q^@PGCL;p_5WxTdCc_k6

delta 93
zcmZ3)vW$gu&07Z6Dh387*@>JvQpy_kR>m<YHReD%+Q2Xt$TS1e#wKPPd$SpJWTP!C
VV?p9@1u$t{%UDfD1_mI40RV%q6*~X`

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index c4951ef9c395d0cbf6fcd88f346147f203f56d71..f80d827952f3932fefce69d8dff3bd3c936fc974 100644
GIT binary patch
delta 40
rcmaFF{eXLeGc&Vdw9(|b%np;=nT4S29QK%$Dh39|OPd8)E-?ZC1QZM)

delta 42
scmaFB{fK*mGc$`)w2|@T*~|`;+n9x5oE-Kl1_s6}F)5q*SS~RF02c)eg#Z8m

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 2850cab12084b5e8646a38fce67b55538d87dff3..bf444b7fb01ec53104f244ac8582f8482a42fcad 100644
GIT binary patch
delta 63
zcmZo<YiHwJ^Ok|Nih+UY-$c#>nucZ?_ErYb2D)akHPMD9y5_MlDK$pXM#g65ma#R)
T(FVpQrWUa^76u#Nh%x~HNQM$^

delta 57
zcmZo?Yh>eG^Ok|Nih+UY$3)Hp%Gzcc_ErYb2D-*(u{F_#Cc5UaF)1}h(MBM?akR0C
KMeN2;qD%nZa1h%7

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index 565dc363c77abf30abef5913b8e67735f5da098a..3002dfb745132049f1067b2c5723976879fa703d 100644
GIT binary patch
delta 29
kcmbQrI)zna&07Z6Dh39oZUzPhMn*;k?r0;^jiL=q0A%_G1poj5

delta 30
lcmbQjI+ay)&07Z6Dh39o9tH*mMn*;ko@gUevyCDROaN;120Z`(

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index 010e1269a5d330737f38cfda8868ed09709a8c17..5dcd3849af08f1ecd067e742084e2dfb8229fe31 100644
GIT binary patch
delta 49
zcmeyt@|%To&07Z6Dh39oqKTXe(xn>qRz^S^ZDbr9lTu?EZD?c~TVob&U>Lj6(VPhY
Da9|E2

delta 46
zcmey(@`HtQ&07Z6Dh39o{E3_j5=9#JRz^S^ZDbr9lTu?EZD?c~TVrOp(Z!qz07aS&
AH2?qr

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index 2ee1fa962b1be90e46a11c833ec3d5bd2148017b..3bcfaa801c6e3dede46d22a25e866e5f71f00b34 100644
GIT binary patch
delta 26
icmeyw_K}Tq&07Z6Dh3ATjES6zjENJqr8c_hFarQ|s0Wn*

delta 28
kcmey!_KA&i&07Z6Dh3AT%!!<ej7bx<r5KGjy6P|k0D_+f$^ZZW

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index 096e04969097e5367995dcad31bef2346351338e..e9d67f428c3bb830b540fbfa915d3027c013ee06 100644
GIT binary patch
delta 31
ncmaFD{Fs?@&07Z6Dh39|TN61aa`IV58|a#t=~`}F;=l+1qG}0a

delta 32
ocmaFN{Dhfv&07Z6Dh39|+Y>n_a`9V68yFg!n3-E_T<pLI0IR$Sr2qf`

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 1c8cb6362f9462922d9c4b717e1e35abac8b56ac..d67fad0ce9412d6a90110e4aa2b199e8536fe5dd 100644
GIT binary patch
delta 205
zcmcb~_K1yh&07Z6Dh3AT$cdco0uDwR_EymbMi#L#Db?mW78B=bu$x<gIU8?>GftLa
zHWv}q0LmHFYJw<ZC^gxYNq+KuCUrAekO79#hPsxqHPL23!aUkQ*Vq)u)vU2FV`N}9
zP%&g=00L1BqnH$k89FAD^Oz(g*o?pyBdHMwTQPY7ld=-XRD&9G6U`danrI8lSOX+w
IAmbPq05_m8KL7v#

delta 181
zcmaFFc9V^B&07Z6Dh3ATfQg*#d_G1R_Eymb=9aNBDb?l^7ifqYS%8^37PU1d(T2KU
z3A2so!x_0mG>i;2HGt|&CeLM(l3+42WMp7APyv!aAf#br1eP?O{FX^Vipj_bNm5oL
z+Q`%bY?RStS!QLyXage?bD-HZrZv$(aRY<NtxQJTTt?9bhGsxf3$w}6OipYda~T)_
Ds{$&h

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index b4f4e3b26d567d36d265ae5331be03f6dc577cf3..fd3ed6b4ccd650f8c716665d0dfc418f407fbedb 100644
GIT binary patch
delta 48
zcmbQjI+>Mo&07Z6Dh39ou8Eu$QpOtgR?&t=vC&2*x)!lD#?i*6Alf9_cw>wO697Ah
B4E6v3

delta 49
zcmbQtI)#;U&07Z6Dh39o?unch(k2@AR?&t=vC&2*x)!lD#?i*6Alf9_*koh01rq>B
Cm<=od

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
index a5ea1793c06b1f804aeca25c7642354da347d327..605df51a6811cd4b89586e0c7e4244423b9d59e1 100644
GIT binary patch
delta 62
zcmbQlJeQes&07Z6Dh39|DHAyp<qb_NVp6J&YirCk?5#{<Qff@24U9~6En;iTq78IS
RCN_w&u>%#D>P(#Z696(~63YMp

delta 68
zcmbQsJc*fe&07Z6Dh39|&WW6f`WogM_Esh_DK)0i21cg37O^#E(FTUGnlUNWCbcyd
U(I!A4AltN-k%1LRPh9d70F<H>r2qf`

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index 7f55e5ae9db9440ee7ff88a0190fbcb5b30f43fa..a9ca75a944e1041a3d059d2659569e0d07c6e878 100644
GIT binary patch
delta 67
zcmeBWna9kz<}Cwj6$1m~)QOxbx;!S)M!F_uu`wytrnQU=tU%fvNVA(58JZg!88b36
Ra2rLN>RNymY&_}02mm(#5TpPA

delta 179
zcmbQo+{?nb<}Cwj6$1kk%S29<dQS~|D<dE_HH|jVHI1z?w}>_{G>+A*F@Z`LM4MVz
z#?}}{8yM>X>1ZP$8Iz(}6K!l_24qwl)oN-2DdSp3238<#4y4&lj10{Ujf@!?8EnC3
t1C0WjZej-3T4NdwVrbTw1BGRQ;^rU&Yb>ITOu)hx5JN#`Zj5qa1ONzMF0B9n

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index a023e7b249aaedddf0ad5d9fad029155a254404d..e52ec10fb414d3b882549294b1d8daf02f5cb4cb 100644
GIT binary patch
delta 49
zcmbO!G(%{D4x{}-UB=CNjJKKCRH_&lSQs|*v;1e~sRgnbSv46rR16g+C$h#(uHaY*
E05q5k3IG5A

delta 51
zcmbOsG*f7T4x__DT}DR3&AN=Ynb@ir7+4roHuJIkXXXL28QE$z88}o76(%RJ#!W8g
GSO@?>L<~9r

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index d059d665236d7fa2792a9b6e0e16ee33d509787c..8f7318207187d8efa126a0a531c8eaa636449ed9 100644
GIT binary patch
delta 36
scmaFO^o)sf&07Z6Dh39|*omA0jH(l(q_`|&Yb-1@V^XTkCN{qS0L>2zi~s-t

delta 41
xcmaFH^qPrt&07Z6Dh39|q=}pXj9L?;r1&jjYb-1@qYZT}V`EaPO()j9000B`4C4R*

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index 3f9e56717131f7043f3c08d882fb856a7ba4942b..0350bb98739dbae5d25a48a39f76389cfa206a5c 100644
GIT binary patch
delta 31
ncmdnZypfr6&07Z6Dh39|6%#o_8Dl5L2eRr~#>S*f-2Vpvnz{;~

delta 41
xcmdnUyqlSG&07Z6Dh39|O%pjo8Pg}m2l5-~np?)kq|{hM8yFf}#!lS&2LJ{K4OIXD

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index 18262d29cd4ea6001b1cd3ce97077b83a7ecac79..aedacceecd6b8f3f577d8a1b8fb0197c4708fae5 100644
GIT binary patch
delta 29
lcmZ3_w~lXuCS&|YEgr_r=8Tt^*o><f7?>3{^Rp;00|0$K2KfL0

delta 31
ncmZ3-x1Mi;CS$@zEgnWjlg(y~mzdb97#NrpjW_eLC@=#6hn5E}

diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 24eb8d708..1e2ef4525 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -21,18 +21,12 @@ import junit.framework.TestCase;
 /**
  * Unit tests for AsYouTypeFormatter.java
  *
- * Note that these tests use the metadata contained in the files with TEST_META_DATA_FILE_PREFIX,
- * not the normal metadata files, so should not be used for regression test purposes - these tests
- * are illustrative only and test functionality.
+ * Note that these tests use the test metadata, not the normal metadata file, so should not be used
+ * for regression test purposes - these tests are illustrative only and test functionality.
  *
  * @author Shaopeng Jia
  */
-public class AsYouTypeFormatterTest extends TestCase {
-  private PhoneNumberUtil phoneUtil;
-
-  public AsYouTypeFormatterTest() {
-    phoneUtil = PhoneNumberUtilTest.initializePhoneUtilForTesting();
-  }
+public class AsYouTypeFormatterTest extends TestMetadataTestCase {
 
   public void testInvalidRegion() {
     AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ);
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
index 9127f7799..30a8faba9 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
@@ -33,13 +33,7 @@ import java.util.NoSuchElementException;
  * @author Tom Hofmann
  * @see PhoneNumberUtilTest {@link PhoneNumberUtilTest} for the origin of the test data
  */
-public class PhoneNumberMatcherTest extends TestCase {
-  private PhoneNumberUtil phoneUtil;
-
-  @Override
-  protected void setUp() throws Exception {
-    phoneUtil = PhoneNumberUtilTest.initializePhoneUtilForTesting();
-  }
+public class PhoneNumberMatcherTest extends TestMetadataTestCase {
 
   /** See {@link PhoneNumberUtilTest#testParseNationalNumber()}. */
   public void testFindNationalNumber() throws Exception {
@@ -710,6 +704,19 @@ public class PhoneNumberMatcherTest extends TestCase {
     assertEquals(expected, actual);
   }
 
+  public void testNonPlusPrefixedNumbersNotFoundForInvalidRegion() throws Exception {
+    // Does not start with a "+", we won't match it.
+    Iterable<PhoneNumberMatch> iterable = phoneUtil.findNumbers("1 456 764 156", RegionCode.ZZ);
+    Iterator<PhoneNumberMatch> iterator = iterable.iterator();
+
+    assertFalse(iterator.hasNext());
+    try {
+      iterator.next();
+      fail("Violation of the Iterator contract.");
+    } catch (NoSuchElementException e) { /* Success */ }
+    assertFalse(iterator.hasNext());
+  }
+
   public void testEmptyIteration() throws Exception {
     Iterable<PhoneNumberMatch> iterable = phoneUtil.findNumbers("", RegionCode.ZZ);
     Iterator<PhoneNumberMatch> iterator = iterable.iterator();
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index d78e80f1e..fd151689a 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -31,19 +31,13 @@ import java.util.List;
 /**
  * Unit tests for PhoneNumberUtil.java
  *
- * Note that these tests use the metadata contained in the files with TEST_META_DATA_FILE_PREFIX,
- * not the normal metadata files, so should not be used for regression test purposes - these tests
- * are illustrative only and test functionality.
+ * Note that these tests use the test metadata, not the normal metadata file, so should not be used
+ * for regression test purposes - these tests are illustrative only and test functionality.
  *
  * @author Shaopeng Jia
  * @author Lara Rennie
  */
-public class PhoneNumberUtilTest extends TestCase {
-  private PhoneNumberUtil phoneUtil;
-  // This is used by BuildMetadataProtoFromXml.
-  static final String TEST_META_DATA_FILE_PREFIX =
-      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
-
+public class PhoneNumberUtilTest extends TestMetadataTestCase {
   // Set up some test numbers to re-use.
   private static final PhoneNumber ALPHA_NUMERIC_NUMBER =
       new PhoneNumber().setCountryCode(1).setNationalNumber(80074935247L);
@@ -110,17 +104,6 @@ public class PhoneNumberUtilTest extends TestCase {
   private static final PhoneNumber INTERNATIONAL_TOLL_FREE_TOO_LONG =
       new PhoneNumber().setCountryCode(800).setNationalNumber(1234567890L);
 
-  public PhoneNumberUtilTest() {
-    phoneUtil = initializePhoneUtilForTesting();
-  }
-
-  static PhoneNumberUtil initializePhoneUtilForTesting() {
-    PhoneNumberUtil.resetInstance();
-    return PhoneNumberUtil.getInstance(
-        TEST_META_DATA_FILE_PREFIX,
-        CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap());
-  }
-
   public void testGetSupportedRegions() {
     assertTrue(phoneUtil.getSupportedRegions().size() > 0);
   }
@@ -1036,11 +1019,9 @@ public class PhoneNumberUtilTest extends TestCase {
     // Invalid country calling codes.
     invalidNumber.setCountryCode(3923).setNationalNumber(2366L);
     assertFalse(phoneUtil.isValidNumberForRegion(invalidNumber, RegionCode.ZZ));
-    invalidNumber.setCountryCode(3923).setNationalNumber(2366L);
-    assertFalse(phoneUtil.isValidNumberForRegion(invalidNumber, RegionCode.UN001));
-    invalidNumber.setCountryCode(0).setNationalNumber(2366L);
     assertFalse(phoneUtil.isValidNumberForRegion(invalidNumber, RegionCode.UN001));
     invalidNumber.setCountryCode(0);
+    assertFalse(phoneUtil.isValidNumberForRegion(invalidNumber, RegionCode.UN001));
     assertFalse(phoneUtil.isValidNumberForRegion(invalidNumber, RegionCode.ZZ));
   }
 
@@ -1594,6 +1575,38 @@ public class PhoneNumberUtilTest extends TestCase {
     assertEquals(premiumNumber, phoneUtil.parse("0900 a332 600A5", RegionCode.NZ));
   }
 
+  public void testParseMaliciousInput() throws Exception {
+    // Lots of leading + signs before the possible number.
+    StringBuilder maliciousNumber = new StringBuilder(6000);
+    for (int i = 0; i < 6000; i++) {
+      maliciousNumber.append('+');
+    }
+    maliciousNumber.append("12222-33-244 extensioB 343+");
+    try {
+      phoneUtil.parse(maliciousNumber.toString(), RegionCode.US);
+      fail("This should not parse without throwing an exception " + maliciousNumber);
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals("Wrong error type stored in exception.",
+                   NumberParseException.ErrorType.TOO_LONG,
+                   e.getErrorType());
+    }
+    StringBuilder maliciousNumberWithAlmostExt = new StringBuilder(6000);
+    for (int i = 0; i < 350; i++) {
+      maliciousNumberWithAlmostExt.append("200");
+    }
+    maliciousNumberWithAlmostExt.append(" extensiOB 345");
+    try {
+      phoneUtil.parse(maliciousNumberWithAlmostExt.toString(), RegionCode.US);
+      fail("This should not parse without throwing an exception " + maliciousNumberWithAlmostExt);
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals("Wrong error type stored in exception.",
+                   NumberParseException.ErrorType.TOO_LONG,
+                   e.getErrorType());
+    }
+  }
+
   public void testParseWithInternationalPrefixes() throws Exception {
     assertEquals(US_NUMBER, phoneUtil.parse("+1 (650) 253-0000", RegionCode.NZ));
     assertEquals(INTERNATIONAL_TOLL_FREE, phoneUtil.parse("011 800 1234 5678", RegionCode.US));
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
index 20644d211..c6d2c7481 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
@@ -25,16 +25,10 @@ import java.io.InputStream;
  *
  * @author Shaopeng Jia
  */
-public class ShortNumberUtilTest extends TestCase {
+public class ShortNumberUtilTest extends TestMetadataTestCase {
   private ShortNumberUtil shortUtil;
-  static final String TEST_META_DATA_FILE_PREFIX =
-      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
 
   public ShortNumberUtilTest() {
-    PhoneNumberUtil.resetInstance();
-    PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(
-        TEST_META_DATA_FILE_PREFIX,
-        CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap());
     shortUtil = new ShortNumberUtil(phoneUtil);
   }
 
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
new file mode 100644
index 000000000..457712570
--- /dev/null
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 The Libphonenumber Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.i18n.phonenumbers;
+
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Root class for PhoneNumberUtil tests that depend on the test metadata file.
+ * <p>
+ * Note since tests that extend this class do not use the normal metadata file, they should not be
+ * used for regression test purposes.
+ *
+ * @author Shaopeng Jia
+ * @author Lara Rennie
+ */
+public class TestMetadataTestCase extends TestCase {
+  private static final String TEST_META_DATA_FILE_PREFIX =
+      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
+
+  protected final PhoneNumberUtil phoneUtil;
+
+  public TestMetadataTestCase() {
+    phoneUtil = initializePhoneUtilForTesting();
+  }
+
+  static PhoneNumberUtil initializePhoneUtilForTesting() {
+    PhoneNumberUtil.resetInstance();
+    PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(
+        TEST_META_DATA_FILE_PREFIX,
+        CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap());
+    return phoneUtil;
+  }
+}
diff --git a/java/release_notes.txt b/java/release_notes.txt
index 5970332a7..ecfdd28e2 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,12 @@
+March 16th, 2012: libphonenumber-4.7
+* Bug fixes
+ - Now return "too long" for input that is longer than 250 chars when parsing
+* Metadata changes
+ - AC,AM,AT,AZ,BF,BR,BY,BZ,CR,CU,DE,DJ,EE,EG,ET,GA,GH,HK,HN,ID,IN,JP,KE,KG,KH,KR,KW,KY,LB,LU,MA,MD,
+   MK,NA,NE,NZ,SA,SB,SC,SE,SL,SN,UZ
+ * Refactoring of test classes so that tests requiring the test metadata to be loaded have a common
+   base class which handles this.
+
 February 9th, 2012: libphonenumber-4.6
 * Bug fixes
  - Fix for formatByPattern to enable RFC formatting to work
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
index bdbf55cb1..6fe4704cb 100644
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@@ -30,7 +30,7 @@
      applied.
 
      Country code, international and national prefix information main source:
-     http://www.itu.int/publ/T-SP-E.164C-2010/en
+     http://www.itu.int/pub/T-SP-E.164C-2011
 
      Emergency numbers Wikipedia source:
      http://en.wikipedia.org/wiki/Emergency_telephone_number
@@ -94,15 +94,18 @@
     <territory id="AC" countryCode="247" internationalPrefix="00">
       <!-- Formatted as a block. -->
       <generalDesc>
-        <nationalNumberPattern>[2-46]\d{3}</nationalNumberPattern>
+        <nationalNumberPattern>[2-467]\d{3}</nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- The prefix 70 has been added since it has been seen online, such as for the number of
+             the Ascension Island local government itself. -->
         <nationalNumberPattern>
           (?:
             3[0-5]|
             4[4-6]|
-            [26]\d
+            [26]\d|
+            70
           )\d{2}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
@@ -573,7 +576,10 @@
                nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{6})">
-          <leadingDigits>1</leadingDigits>
+          <leadingDigits>
+            1|
+            47
+          </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{6})" nationalPrefixFormattingRule="$NP$FG">
@@ -596,10 +602,12 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1-35-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- Includes telephone numbers in Nagorno-Karabakh Republic, physically located inside
+             Azerbaijan. -->
         <nationalNumberPattern>
           (?:
             10\d|
@@ -611,14 +619,16 @@
               6[1-9]|
               8[1-7]
             )|
-            3[12]2
+            3[12]2|
+            47\d
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>10123456</exampleNumber>
       </fixedLine>
       <mobile>
         <!-- Adding 55 from online numbers found and SMSs received from numbers with this prefix. It
-             seems to be used by Orange Armenia.  -->
+             seems to be used by Orange Armenia. Part of the range 97 is used by Nagorno-Karabakh
+             Republic. -->
         <nationalNumberPattern>
           (?:
             55|
@@ -1322,7 +1332,7 @@
           (?:
             2(?:
               1[467]|
-              2[134-8]|
+              2[13-8]|
               5[2357]|
               6[1-46-8]|
               7[1-8]|
@@ -1817,26 +1827,7 @@
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>22</leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>36[0-46-9]</leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{3})(\d)(\d{2})(\d{2})">
-          <leadingDigits>
-            1[013-79]|
-            2(?:
-              [45][13-9]|
-              [7-9]
-            )
-          </leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})"
-          nationalPrefixFormattingRule="$NP$FG">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[4-8]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
@@ -1847,73 +1838,32 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1-9]\d{7,8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
+        <nationalNumberPattern>[1-9]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Added the 164 area code after it was found in other online lists and in many online
-             numbers. Also includes the area code 44 for CDMA regions, which are classified under
-             "Fixed Network" by the national plan.
-             The following regexp covers both the pre and post August 1st 2011 plans running in
-             parallel until December 31st 2011. -->
         <nationalNumberPattern>
           (?:
-            1(?:
-              (?:
-                [28]\d|
-                9
-              )\d|
-              02|
-              1[0-589]|
-              3[358]|
-              4[013-79]|
-              5[0-479]|
-              6[02346-9]|
-              7[0-24-8]
-            )|
+            1[28]\d|
             2(?:
-              02\d|
-              1(?:
-                2[0-8]|
-                42|
-                6
-              )|
-              2(?:
-                2[0-79]|
-                3[0-35]|
-                42|
-                [1-35-9]|
-              )|
-              3(?:
-                3[0-58]|
-                [0-24]
-              )|
-              4(?:
-                2[0124579]|
-                [1468]
-              )|
-              5(?:
-                2[0124579]|
-                5
-              )|
-              6(?:
-                2\d|
-                3[0128]|
-                [56]
-              )|
-              79
+              02|
+              1[24]|
+              2[2-4]|
+              33|
+              [45]2|
+              6[23]
             )|
-            365?\d|
-            44\d{2}
-          )\d{5}
+            365
+          )\d{6}
         </nationalNumberPattern>
         <exampleNumber>123123456</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
           (?:
-            [46]0|
+            4[04]|
             5[015]|
+            60|
             7[07]
           )\d{7}
         </nationalNumberPattern>
@@ -2454,11 +2404,14 @@
              Including 716 as well since many numbers seem to have this prefix. -->
         <nationalNumberPattern>
           (?:
-            60[0-3]|
+            6(?:
+              0[0-3]|
+              8\d
+            )|
             7(?:
               [02-68]\d|
               1[0-4689]|
-              7[0-6]|
+              7[0-69]|
               9[0-689]
             )
           )\d{5}
@@ -3060,17 +3013,24 @@
     </territory>
 
     <!-- Brazil -->
-    <!-- http://en.wikipedia.org/wiki/%2B55 -->
+    <!-- http://en.wikipedia.org/wiki/%2B55
+         http://www.itu.int/oth/T020200001D/en -->
     <territory id="BR" countryCode="55"
                internationalPrefix="00(?:1[45]|2[135]|[34]1|43)"
                nationalPrefix="0"
-               nationalPrefixForParsing="0(?:(1[245]|2[135]|[34]1)(\d{10}))?"
+               nationalPrefixForParsing="0(?:(1[245]|2[135]|[34]1)(\d{10,11}))?"
                nationalPrefixTransformRule="$2">
       <!--The national prefix for parsing here also contains a capturing group for the main number,
            since the carrier codes here may also be area codes, so we want to check the length of
            the number after capturing. We also need a nationalTransformRule to repopulate with the
            number without the carrier code. -->
       <availableFormats>
+        <numberFormat nationalPrefixFormattingRule="($FG)"
+          pattern="(\d{2})(\d{5})(\d{4})"
+          carrierCodeFormattingRule="$NP $CC ($FG)">
+          <leadingDigits>119</leadingDigits>
+          <format>$1 $2-$3</format>
+        </numberFormat>
         <numberFormat nationalPrefixFormattingRule="($FG)"
           pattern="(\d{2})(\d{4})(\d{4})"
           carrierCodeFormattingRule="$NP $CC ($FG)">
@@ -3088,8 +3048,11 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1-9]\d{7,9}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [1-46-9]\d{7,10}|
+          5\d{8,9}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
         <nationalNumberPattern>[34]00\d{5}</nationalNumberPattern>
@@ -3118,8 +3081,9 @@
         <nationalNumberPattern>
           1(?:
             1(?:
-              [6-9]\d|
-              5[347]
+              5[347]|
+              [6-8]\d|
+              9\d{1,2}
             )|
             [2-9][6-9]\d
           )\d{6}|
@@ -3131,7 +3095,7 @@
             7[13-579]
           )[6-9]\d{7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
         <exampleNumber>1161234567</exampleNumber>
       </mobile>
       <tollFree>
@@ -3438,7 +3402,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [12-4]\d{8}|
+          [1-4]\d{8}|
           [89]\d{9,10}
         </nationalNumberPattern>
         <!-- Numbers are often written without the city code. -->
@@ -3573,14 +3537,9 @@
         <exampleNumber>2221234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 62[6-9] and 63X were added as we have been able to successfully send SMSs to these
-             numbers. -->
-        <nationalNumberPattern>
-          6(?:
-            [0-3]\d|
-            [67][01]
-          )\d{4}
-        </nationalNumberPattern>
+        <!-- 62[6-9], 63X and 6[67][2-9] were added as we have been able to successfully send SMSs
+             to these numbers or many numbers have been found online. -->
+        <nationalNumberPattern>6[0-367]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>6221234</exampleNumber>
       </mobile>
@@ -4719,7 +4678,7 @@
     <!-- Costa Rica -->
     <!-- http://www.itu.int/oth/T0202000030/en -->
     <territory id="CR" countryCode="506" internationalPrefix="00"
-      nationalPrefixForParsing="(19(?:0[0-2]|19|77))" carrierCodeFormattingRule="$CC $FG">
+      nationalPrefixForParsing="(19(?:0[0-2468]|19|66|77))" carrierCodeFormattingRule="$CC $FG">
       <availableFormats>
         <numberFormat pattern="(\d{4})(\d{4})">
           <leadingDigits>
@@ -4768,17 +4727,21 @@
         <exampleNumber>9001234567</exampleNumber>
       </premiumRate>
       <voip>
+        <!-- Including trunking service numbers starting with 5100. -->
         <nationalNumberPattern>
+          210[0-6]\d{4}|
           40(?:
-            00\d{4}|
+            [04]0\d{4}|
             10[0-3]\d{3}|
             2(?:
               00\d|
               900
             )\d{2}|
             3[01]\d{4}|
-            5\d{5}
-          )
+            5\d{5}|
+            70[01]\d{3}
+          )|
+          5100\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>40001234</exampleNumber>
@@ -4789,29 +4752,34 @@
           1(?:
             0(?:
               00|
+              15|
               2[2-4679]
             )|
             1(?:
               1[0-35-9]|
               37|
-              46|
+              [46]6|
               75|
               8[79]|
               9[0-379]
             )|
             2(?:
-              12|
-              22|
-              34
+              00|
+              [12]2|
+              34|
+              55
             )|
             333|
             400|
-            55[15]|
+            5(?:
+              15|
+              5[15]|
+            )
             693|
             7(?:
               00|
-              1[78]|
-              22|
+              1[789]|
+              2[02]|
               [67]7
             )
           )
@@ -4856,11 +4824,13 @@
           2[1-4]\d{5,6}|
           3(?:
             1\d{6}|
-            [23]\d{4,6})|
+            [23]\d{4,6}
+          )|
           4(?:
             [125]\d{5,6}|
             [36]\d{6}|
-            [78]\d{4,6})|
+            [78]\d{4,6}
+          )|
           7\d{6,7}
         </nationalNumberPattern>
         <exampleNumber>71234567</exampleNumber>
@@ -4870,9 +4840,21 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>51234567</exampleNumber>
       </mobile>
+      <shortCode>
+        <nationalNumberPattern>
+          1(?:
+            1(?:
+              6111|
+              8
+            )|
+            40
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
+        <exampleNumber>140</exampleNumber>
+      </shortCode>
       <emergency>
-        <!-- http://www.cubaweb.cu/en/comunicaciones -->
-        <nationalNumberPattern>10[56]</nationalNumberPattern>
+        <nationalNumberPattern>10[456]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>106</exampleNumber>
       </emergency>
@@ -5018,7 +5000,7 @@
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Includes paging numbers. -->
+        <!-- Includes paging numbers (they are mixed into the same block). -->
         <nationalNumberPattern>9[5-79]\d{6}</nationalNumberPattern>
         <exampleNumber>96123456</exampleNumber>
       </mobile>
@@ -5374,6 +5356,26 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(1\d{2})(\d{5,11})">
+          <leadingDigits>181</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <!-- Where we have seen prefixes in use for the IVPN/User Group numbers, we format it the
+             way it is generally written. For other prefixes, we fall back to using a three-digit
+             prefix since we have currently no more information to allow us to format these more
+             precisely. -->
+        <numberFormat pattern="(18\d{3})(\d{6})">
+          <leadingDigits>18500</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(18\d{2})(\d{7})">
+          <leadingDigits>18[68]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(18\d)(\d{8})">
+          <leadingDigits>18[2-579]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <numberFormat pattern="(700)(\d{4})(\d{4})">
           <leadingDigits>700</leadingDigits>
           <format>$1 $2 $3</format>
@@ -5482,6 +5484,19 @@
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
         <exampleNumber>70012345678</exampleNumber>
       </personalNumber>
+      <uan>
+        <!-- Using UAN for numbers marked in the plan as being assigned to International Virtual
+             Private Networks (0181) & User Groups (018[2-9]). These seem in practice to be assigned
+             to companies. More information here: http://de.wikipedia.org/wiki/Vorwahl_01 -->
+        <nationalNumberPattern>
+          18(?:
+            1\d{5,11}|
+            [2-9]\d{8}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{8,14}</possibleNumberPattern>
+        <exampleNumber>18500123456</exampleNumber>
+      </uan>
       <emergency>
         <nationalNumberPattern>11[02]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
@@ -5493,26 +5508,17 @@
     <!-- http://www.itu.int/oth/T020200003A/en -->
     <territory id="DJ" countryCode="253" internationalPrefix="00">
       <availableFormats>
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})">
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
-      <!--TODO: Remove support for 6-digit numbers after March 1st, 2012, when the national
-          numbering plan is going to migrate to 8 digits. -->
       <generalDesc>
-        <nationalNumberPattern>[1-8]\d{5,7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
+        <nationalNumberPattern>[27]\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <!-- Includes "Numéro long CDMA fixe" numbers. -->
         <nationalNumberPattern>
-          (?:
-            1[05]|
-            [2-5]\d
-          )\d{4}|
           2(?:
             1[2-5]|
             7[45]|
@@ -5521,7 +5527,7 @@
         <exampleNumber>21360003</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>(?:77)?[6-8]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>77[6-8]\d{5}</nationalNumberPattern>
         <exampleNumber>77831001</exampleNumber>
       </mobile>
       <emergency>
@@ -5933,7 +5939,7 @@
     <!-- http://www.tja.ee/public/Legislation_side/Numbering_/Estonian_NP_eng.htm -->
     <territory id="EE" countryCode="372" internationalPrefix="00">
       <availableFormats>
-        <numberFormat pattern="([34-79]\d{2})(\d{4})">
+        <numberFormat pattern="([3-79]\d{2})(\d{4})">
           <leadingDigits>
             [369]|
             4[3-8]|
@@ -6098,7 +6104,7 @@
              1(?:
                0[0169]|
                1[124]|
-               2[0278]|
+               2[0-278]|
                5[0-2]
              )|
              [89]00
@@ -6115,9 +6121,12 @@
            </leadingDigits>
            <format>$1 $2 $3</format>
          </numberFormat>
-         <numberFormat pattern="(\d{2})(\d{7})">
+         <numberFormat pattern="(\d{2})(\d{6,7})">
            <leadingDigits>
-             13|
+             1(?:
+               3|
+               5[23]
+             )|
              [4-6]|
              [89][2-9]
            </leadingDigits>
@@ -6134,34 +6143,44 @@
         <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Short numbers used for businesses (starting with 16 or 19) are covered here. -->
+        <!-- Short numbers used for businesses (starting with 16 or 19) are covered here. Note also
+             that the plan says numbers starting with 15 should be followed by seven digit
+             subscriber numbers, but all numbers we have found online are in fact six digit.
+             Subscriber numbers starting with 5 are also permitted for the area codes 040, with 5, 6
+             and 7 for the area code 050, with 5 and 7 for 082, with 6 for 084, with 7 for 086 and
+             092 and with 5 and 6 for 96. -->
         <nationalNumberPattern>
           (?:
-            1[35][23]|
-            2[23]\d|
-            3\d|
+            1(
+              3[23]\d|
+              5[23]
+            )|
+            2[2-4]\d{2}|
+            3\d{2}|
             4(?:
-              0[2-4]|
+              0[2-5]|
               [578][23]|
               64
-            )|
+            )\d|
             5(?:
-              0[234]|
+              0[2-7]|
               [57][23]
-            )|
-            6[24-689]3|
+            )\d|
+            6[24-689]3\d|
             8(?:
-              [28][2-4]|
-              42|
-              6[23]
-            )|
+              2[2-57]|
+              4[26]|
+              6[237]|
+              8[2-4]
+            )\d|
             9(?:
-              [25]2|
+              2[27]|
               3[24]|
-              6[23]|
+              52|
+              6[2356]|
               7[2-4]
-            )
-          )\d{6}|
+            )\d
+          )\d{5}|
           1[69]\d{3}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
@@ -6169,7 +6188,9 @@
       </fixedLine>
       <mobile>
         <!-- Egypt is switching to a 10-digit pattern on October 6th. This will run in parallel with
-             the old pattern for three months, so we support both here in the meantime. -->
+             the old pattern for three months, so we support both here in the meantime. Adding the
+             extra prefix 121 from user reports that Mobinil has started allocating numbers
+             beginning with this prefix. -->
         <nationalNumberPattern>
           1(?:
             [0-246-9]|
@@ -6178,7 +6199,7 @@
           1(?:
             0[0169]|
             1[124]|
-            2[0278]
+            2[0-278]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
@@ -6361,7 +6382,7 @@
               4(?:
                 1[69]|
                 3[2-49]|
-                4[0-23]|
+                4[0-3]|
                 6[5-8]
               )|
               5(?:
@@ -7010,7 +7031,7 @@
               2[89]|
               3[35-9]|
               4[01]|
-              5[0-347-9]|
+              5[0-47-9]|
               [67]\d|
               8[457-9]|
               9[0146]
@@ -7545,7 +7566,7 @@
         <exampleNumber>7640123456</exampleNumber>
       </pager>
       <!-- Source for non geographic numbers:
-           http://en.wikipedia.org/wiki/Non-geographical_telephone_numbers_in_the_UK -->
+           http://en.wikipedia.org/wiki/Non-geographic_telephone_numbers_in_the_United_Kingdom -->
       <tollFree>
         <!-- 800 1111 with 7 digits, 800 with 9 or 10 digits, 808 with 10 digits, 500 with 9 digits. -->
         <nationalNumberPattern>
@@ -8048,13 +8069,26 @@
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})">
-            <format>$1 $2 $3</format>
+          <leadingDigits>[235]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{5})">
+          <leadingDigits>8</leadingDigits>
+          <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[235]\d{6,8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          [235]\d{8}|
+          8\d{7}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>800\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80012345</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>
           3(?:
@@ -8103,7 +8137,14 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>231234567</exampleNumber>
       </mobile>
-      <!-- No tollFree or premiumRate information can be found. -->
+      <tollFree>
+        <!-- Found online references to these numbers, although they are not in the plan since they
+             are not internationally diallable. -->
+        <nationalNumberPattern>800\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80012345</exampleNumber>
+      </tollFree>
+      <!-- No premiumRate information can be found. -->
       <emergency>
         <nationalNumberPattern>
           19[123]|
@@ -8951,10 +8992,15 @@
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>[5-79]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[569]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>51234567</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>7\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>71234567</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>800\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -8996,6 +9042,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- Extra prefixes 228X and 2292 were added from numbers found online.  -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -9004,7 +9051,8 @@
               [23]\d|
               4[056]|
               5[57]|
-              9[01]
+              8[0146-9]|
+              9[012]
             )|
             4(?:
               2|3-59]|
@@ -9358,9 +9406,15 @@
         <!-- Area codes taken from wikipedia, with missing ones added from
              http://www.telkom.co.id/customer-services/area-and-country-code/?type=area.
              We also added 0770 after user feedback because it seems to be used on Bintan island.
-             -->
+             Where known, fixed mobile prefixes have been represented as Mobile. -->
         <nationalNumberPattern>
-          2[124]\d{7,8}|
+          2(?:
+            1(?:
+              [0-8]\d{6,7}|
+              9\d{6}
+            )|
+            [24]\d{7,8}
+          )|
           (?:
             2(?:
               [35][1-4]|
@@ -9398,7 +9452,7 @@
               6[1-8]
             )|
             6(?:
-              19? |
+              19?|
               [25]\d|
               3[1-469]|
               4[1-6]
@@ -9413,7 +9467,7 @@
             )|
             9(?:
               0[12]|
-              1[0134-8]|
+              1[013-8]|
               2[0-479]|
               5[125-8]|
               6[23679]|
@@ -9426,7 +9480,87 @@
         <exampleNumber>612345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>8[1-35-9]\d{7,9}</nationalNumberPattern>
+        <!-- It is unclear exactly which prefixes could be mobile phones, based on the information
+             on the wikipedia page. However, Bakrie have provided a list of their prefixes, which
+             are captured below. The pattern covers the area code plus the first one-two digits of
+             the subscriber number. -->
+        <nationalNumberPattern>
+          (?:
+            2(?:
+              1(?:
+                3[145]|
+                4[01]|
+                5[1-469]|
+                60|
+                8[0359]|
+                9\d
+              )|
+              2(?:
+                88|
+                9[1256]
+              )|
+              3[1-4]9|
+              4(?:
+                36|
+                91
+              )|
+              5(?:
+                1[349]|
+                [2-4]9
+              )|
+              6[0-7]9|
+              7(?:
+                [1-36]9|
+                4[39]
+              )|
+              8[1-5]9|
+              9[1-48]9
+            )|
+            3(?:
+              19[1-3]|
+              2[12]9|
+              3[13]9|
+              4(?:
+                1[69]|
+                39
+              )|
+              5[14]9|
+              6(?:
+                1[69]|
+                2[89]
+              )|
+              709
+            )|
+            4[13]19|
+            5(?:
+              1(?:
+                19|
+                8[39]
+              )|
+              4[129]9|
+              6[12]9
+            )|
+            6(?:
+              19[12]|
+              2(?:
+                [23]9|
+                77
+              )
+            )|
+            7(?:
+              1[13]9|
+              2[15]9|
+              419|
+              5(?:
+                1[89]|
+                29
+              )|
+              6[15]9|
+              7[178]9
+            )
+          )\d{5,6}|
+          8[1-35-9]\d{7,9}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9,11}</possibleNumberPattern>
         <exampleNumber>812345678</exampleNumber>
       </mobile>
@@ -10242,8 +10376,10 @@
       </noInternationalDialling>
       <fixedLine>
         <!-- This is a list of the 2 and 3 digit area codes and the first 3 digits of 4 digit area
-             codes, so we can check the following digit belongs to one of the operator-codes (2-6).
+             codes, so we can check the following digit belongs to one of the operator-codes (2-7).
              Operator codes are from wikipedia, with the addition of 5 (HFCL Infotel in some areas).
+             Not all operator codes are available in all areas, but we don't maintain that
+             distinction here.
              Area codes starting with a 7 are listed separately, since the prefixes need to be more
              detailed so they clash less with mobile phone prefixes. -->
         <nationalNumberPattern>
@@ -10253,8 +10389,8 @@
             33|
             4[04]|
             79
-          )[2-6]\d{7}|
-          80[2-46]\d{7}|
+          )[2-7]\d{7}|
+          80[2-467]\d{7}|
           (?:
             1(?:
               2[0-249]|
@@ -10327,7 +10463,7 @@
               8[34]|
               91
             )
-          )[2-6]\d{6}|
+          )[2-7]\d{6}|
           (?:
             (?:
               1(?:
@@ -10384,9 +10520,8 @@
                 2[2457]|
                 3[2-4]|
                 4[235-7]|
-                5[2-689]|
+                [57][2-689]|
                 6[24-58]|
-                7[23-689]|
                 8[1-6]
               )|
               8(?:
@@ -10416,7 +10551,7 @@
                 [013-8]\d
               )
             )
-          )[2-6]\d{5}
+          )[2-7]\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
         <exampleNumber>1123456789</exampleNumber>
@@ -11742,7 +11877,7 @@
               9[1-578]
             )|
             2(?:
-              2[034-9]|
+              2[03-9]|
               3[3-58]|
               4[0-468]|
               5[04-8]|
@@ -11789,7 +11924,7 @@
             9(?:
               [23]0|
               4[02-46-9]|
-              5[0245-79]|
+              5[024-79]|
               6[4-9]|
               7[2-47-9]|
               8[02-7]|
@@ -11884,7 +12019,7 @@
                 9[2-8]
               )|
               3(?:
-                7[2-56]|
+                7[2-6]|
                 [3-6][2-9]|
                 8[2-5]
               )|
@@ -11904,7 +12039,7 @@
             9(?:
               [23]0|
               4[02-46-9]|
-              5[0245-79]|
+              5[024-79]|
               6[4-9]|
               7[2-47-9]|
               8[02-7]|
@@ -12039,7 +12174,7 @@
             9(?:
               [23]0|
               4[02-46-9]|
-              5[0245-79]|
+              5[024-79]|
               6[4-9]|
               7[2-47-9]|
               8[02-7]|
@@ -12181,7 +12316,7 @@
             9(?:
               [23]0|
               4[02-46-9]|
-              5[0245-79]|
+              5[024-79]|
               6[4-9]|
               7[2-47-9]|
               8[02-7]|
@@ -12202,7 +12337,7 @@
             1|
             2(?:
               23|
-              5[5-89]|
+              5[5-9]|
               64|
               78|
               8[39]|
@@ -12482,6 +12617,7 @@
 
     <!-- Kenya -->
     <!-- http://www.cck.go.ke/licensing/numbering/plan.html -->
+    <!-- http://en.wikipedia.org/wiki/+254 -->
     <territory id="KE" countryCode="254" internationalPrefix="000"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
@@ -12500,32 +12636,42 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          20\d{4,7}|
-          [4-9]\d{5,9}
+          20\d{6,7}|
+          [4-9]\d{6,9}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- The prefix 066 is supposed to be used only for 9-digit numbers, but none of these can
+             be found online, and the plan says also it is migrating to 9 digit numbers. Both are
+             supported for now. -->
         <nationalNumberPattern>
-          (?:
-            20|
-            4[0-6]|
-            5\d|
-            6[0-24-9]
-          )\d{4,7}
+          20\d{6,7}|
+          4(?:
+            [013]\d{7}|
+            [24-6]\d{5,7}
+          )|
+          5(?:
+            [0-36-8]\d{5,7}|
+            [459]\d{5}
+          )|
+          6(?:
+            [08]\d{5}|
+            [14-79]\d{5,7}|
+            2\d{7}
+          )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4,9}</possibleNumberPattern>
+        <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
         <exampleNumber>202012345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 70[3-5], 754 and 775 after successful delivery of SMSs. -->
         <nationalNumberPattern>
           7(?:
-            0[0-5]|
+            0[0-8]|
             [123]\d|
-            5[0-4]|
+            5[0-5]|
             7[0-5]|
-            8[6-9]
+            8[5-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -12533,32 +12679,26 @@
       </mobile>
       <tollFree>
         <!-- Longer numbers have been found than the plan suggests, so we support them here too. -->
-        <nationalNumberPattern>800[245-8]\d{5,6}</nationalNumberPattern>
+        <nationalNumberPattern>800[24-8]\d{5,6}</nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>800223456</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>
-          9(?:
-            00[2-578]|
-            11\d
-          )\d{5}
-        </nationalNumberPattern>
+        <nationalNumberPattern>900[02-578]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900223456</exampleNumber>
       </premiumRate>
       <shortCode>
+        <!-- Excluding SMS-only premium-rate short codes for now. -->
         <nationalNumberPattern>
           1(?:
-            0[089]|
+            0[09]|
             1(?:
               [06]|
-              99
+              9[0-2579]
             )|
-            2[123]|
-            3[013]|
-            4[14]|
-            501
+            2[13]|
+            3[01]
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
@@ -12602,7 +12742,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[356-8]\d{8,9}</nationalNumberPattern>
+        <nationalNumberPattern>[35-8]\d{8,9}</nationalNumberPattern>
         <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -12733,7 +12873,7 @@
             (?:
               1[0-35-9]|
               6[6-9]|
-              7[06-89]
+              7[06-9]
             )[1-9]|
             8(?:
               0[89]|
@@ -13045,6 +13185,10 @@
                nationalPrefix="0" nationalPrefixForParsing="0(8[1-46-8]|85\d{2})?"
                nationalPrefixFormattingRule="$NP$FG" carrierCodeFormattingRule="$NP$CC-$FG">
       <availableFormats>
+        <numberFormat pattern="(\d{3})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>11[29]</leadingDigits>
+          <format>$1</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
           <leadingDigits>
             1(?:
@@ -13289,7 +13433,7 @@
         <nationalNumberPattern>
           (?:
             5(?:
-              0[0-26]|
+              0[0-2568]|
               5\d
             )|
             6(?:
@@ -13349,7 +13493,11 @@
         <nationalNumberPattern>[3589]\d{9}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
       </generalDesc>
+      <!-- The 800 NXX code is listed as being "national only", but we successfully reached numbers
+           from Switzerland with this prefix so do not list it as noInternationalDialling. -->
       <fixedLine>
+        <!-- The Westtel numbers in the plan seem now to be live and assigned to fixed-line phones,
+             as per numbers found online and their website www.logic.ky. -->
         <nationalNumberPattern>
           345(?:
             2(?:
@@ -13363,6 +13511,7 @@
               40
             )|
             7(?:
+              4[35-79]|
               6[6-9]|
               77
             )|
@@ -13370,8 +13519,7 @@
               00|
               1[45]|
               25|
-              4[89]|
-              88
+              [48]8
             )|
             9(?:
               14|
@@ -13382,24 +13530,33 @@
         <exampleNumber>3452221234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Adding central office codes 321, 322, 328, 576, 923 & 936 from numbers found online.
+             Most central office codes that were surrendered have not been included, with the
+             exception of 546 where numbers have been found. -->
         <nationalNumberPattern>
           345(?:
-            32[3-79]|
+            32[1-9]|
             5(?:
-              1[467]|
+              1[67]|
               2[5-7]|
-              4[5-9]
+              4[6-8]|
+              76
             )|
             9(?:
-              1[679]|
-              2[4-9]|
-              3[89]
+              1[67]|
+              2[3-9]|
+              3[689]
             )
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>3453231234</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>345849\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>3458491234</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>
           8(?:
@@ -13673,7 +13830,7 @@
             [89][01]|
             7(?:
               [01]|
-              6[01346-9])
+              6[013-9])
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -13701,7 +13858,7 @@
             3\d|
             7(?:
               [01]\d|
-              6[01346-9]
+              6[013-9]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -14245,7 +14402,7 @@
         <!-- Patterns overlap because of variable number length. -->
         <numberFormat pattern="(\d{2})(\d{3})">
           <leadingDigits>
-            [23-5]|
+            [2-5]|
             7[1-9]|
             [89](?:
               [1-9]|
@@ -14256,7 +14413,7 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
-            [23-5]|
+            [2-5]|
             7[1-9]|
             [89](?:
               [1-9]|
@@ -14625,12 +14782,15 @@
         <exampleNumber>520123456</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Prefixes 60[1-5], 62[79], 63[0458] and 680 are from numbers found online, bug-reports,
+             and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
-            0[0-36]|
+            0[0-6]|
             [14-7]\d|
-            2[236]|
-            3[348]|
+            2[23679]|
+            3[03458]|
+            80|
             99
           )\d{6}
         </nationalNumberPattern>
@@ -14745,7 +14905,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[256-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[25-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -15149,12 +15309,13 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- Extra prefix 02 60 added from numbers found online. -->
         <nationalNumberPattern>
           (?:
             2(?:
               [23]\d|
               5[125]|
-              61
+              6[01]
             )|
             3(?:
               1[3-6]|
@@ -16536,7 +16697,7 @@
               17|
               2(?:
                 [0189]\d|
-                [23-6]|
+                [2-6]|
                 7\d?
               )|
               3(?:
@@ -16773,9 +16934,9 @@
         <exampleNumber>20201234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Added 90, 91, 97 & 98 from online data. Zain have confirmed that they use the 97
-             prefix. -->
-        <nationalNumberPattern>9[0134678]\d{6}</nationalNumberPattern>
+        <!-- Added 90, 91, 92, 97, 98 & 99 from online data. Airtel have confirmed that they use the
+             97 prefix, and Orange use 92. -->
+        <nationalNumberPattern>9[0-46-9]\d{6}</nationalNumberPattern>
         <exampleNumber>93123456</exampleNumber>
       </mobile>
       <tollFree>
@@ -17382,6 +17543,7 @@
                preferredInternationalPrefix="00" nationalPrefix="0"
                nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
+        <!-- Pattern for fixed-line formats. -->
         <numberFormat pattern="([34679])(\d{3})(\d{4})">
           <leadingDigits>
             [3467]|
@@ -17389,45 +17551,52 @@
           </leadingDigits>
           <format>$1-$2 $3</format>
         </numberFormat>
+        <!-- Area code for NZ's Scott Base, in Antarctica. -->
+        <numberFormat pattern="(24099)(\d{3})">
+          <leadingDigits>240</leadingDigits>
+          <leadingDigits>2409</leadingDigits>
+          <leadingDigits>24099</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <!-- Mobile numbers do not have exclusive leading digits - formatting depends on number
              length. -->
-        <!-- Vodafone numbers are formatted with 021 separated. -->
-        <numberFormat pattern="(21)(\d{4})(\d{3,4})">
+        <!-- Vodafone numbers can be 8 digits (without leading 0). -->
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
           <leadingDigits>21</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- Paging numbers and some mobile numbers (Telecom/Vodafone/TelstraClear). -->
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})">
+          <leadingDigits>
+            2(?:
+              1[1-9]|
+              [69]|
+              7[0-35-9]
+            )|
+            86
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <!-- 2Degrees numbers are formatted with 022 separated, since this seems to be more common
              than writing the first group as 022X based on Google web searches, and is used by
              2Degrees themselves. See formatting on www.2degreesmobile.co.nz for an example of the
-             latter. -->
-        <numberFormat pattern="(22)(\d{3})(\d{4})">
-          <leadingDigits>22</leadingDigits>
+             latter. We follow the same pattern for 020 (Orcon) and 028 (mixed) numbers. -->
+        <numberFormat pattern="(2\d)(\d{3,4})(\d{4})">
+          <leadingDigits>2[028]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([2589]\d{2})(\d{3})(\d{3,4})">
-          <!-- Note no online 022 numbers can be found that are 10 digits long, but the numbering
-               plan states they are possible, so we format them in this fashion if we see them. -->
-          <!-- Adding in the toll free numbers here as well since they follow the same format. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
+          <!-- 0274, 0210 and toll-free/premium-rate prefixes 0508/0800/0900.  -->
           <leadingDigits>
-            2[0247-9]|
+            2(?:
+              10|
+              74
+            )|
             5|
-            [89]00
+            [89]0
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Vodafone and Orcon numbers can also be 8 digits (without leading 0), and these are
-             formatted differently. -->
-        <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})">
-          <leadingDigits>2[0169]|86</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-        <!-- Antarctica -->
-        <numberFormat pattern="(24099)(\d{3})">
-          <leadingDigits>240</leadingDigits>
-          <leadingDigits>2409</leadingDigits>
-          <leadingDigits>24099</leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -17450,26 +17619,25 @@
         <exampleNumber>32345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Includes mobile radio service numbers. -->
+        <!-- Includes mobile radio service numbers (e.g. TeamTalk). -->
         <nationalNumberPattern>
           2(?:
-            [079]\d{7}|
+            [028]\d{7,8}|
             1(?:
               0\d{5,7}|
               [12]\d{5,6}|
               [3-9]\d{5}
             )|
-            [28]\d{7,8}|
-            4[1-9]\d{6}
+            [79]\d{7}
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
         <exampleNumber>211234567</exampleNumber>
       </mobile>
       <pager>
-          <nationalNumberPattern>[28]6\d{6,7}</nationalNumberPattern>
-          <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
-          <exampleNumber>26123456</exampleNumber>
+        <nationalNumberPattern>[28]6\d{6,7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
+        <exampleNumber>26123456</exampleNumber>
       </pager>
       <!-- These are the toll free patterns used, by Telecom and Telstra/Clear, but they are
            referred to as 'Value-added service' in the phone plan for some reason. 85 numbers are
@@ -19495,7 +19663,7 @@
           (?:
             [12][24-8]|
             3[35-8]|
-            4[34-68]|
+            4[3-68]|
             6[2-5]|
             7[235-7]
           )\d{6}
@@ -19576,14 +19744,14 @@
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
+          48\d{3}|
           7(?:
             4\d|
             5[025-8]|
-            6[01]
+            6[0-4]
           )\d{4}|
           8[4-8]\d{5}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>7421234</exampleNumber>
       </mobile>
       <tollFree>
@@ -19627,8 +19795,6 @@
     <!-- Seychelles -->
     <!-- http://www.itu.int/oth/T02020000BA/en -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Seychelles -->
-    <!-- No evidence can be found that they still use their national prefix, so this is not
-         currently supported. -->
     <territory id="SC" countryCode="248" internationalPrefix="0[0-2]"
       preferredInternationalPrefix="00">
       <availableFormats>
@@ -19646,45 +19812,16 @@
         <possibleNumberPattern>\d{6,7}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Includes Fixed Cellular. We are putting Fixed Services numbers here for now, as we
-             cannot find any evidence that they are more expensive to call than other Fixed Line
-             services. ISDN and DID services are here too, since they seem to be also fixed-line
-             phone numbers. -->
-        <nationalNumberPattern>
-          (?:
-            2(?:
-              55[0-5]|
-              78[013]
-            )|
-            4(?:
-              2(?:
-                0[589]|
-                1[03-9]|
-                [2-9]\d
-              )|
-              [346]\d{2}
-            )
-          )\d{3}
-        </nationalNumberPattern>
+        <!-- We are putting Fixed Services numbers here for now, as we cannot find any evidence that
+             they are more expensive to call than other Fixed Line services. ISDN and DID services
+             are here too, since they seem to be also fixed-line phone numbers. -->
+        <nationalNumberPattern>4[2-46]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>4217123</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Although wikipedia says the prefix 28 is as-of-yet unallocated, open-source users have
-             already reported seeing numbers with this prefix. -->
-        <nationalNumberPattern>
-          2(?:
-            5(?:
-              [0-46-9]\d|
-              5[6-9]
-            )|
-            7(?:
-              [0-79]\d|
-              8[24-9]
-            )|
-            8\d{2}
-          )\d{3}
-        </nationalNumberPattern>
+        <!-- Includes Fixed Cellular. -->
+        <nationalNumberPattern>2[5-8]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>2510123</exampleNumber>
       </mobile>
@@ -19895,7 +20032,7 @@
           4(?:
             [0246]\d{5,7}|
             (?:
-              1[01-8]|
+              1[0-8]|
               3[0135]|
               5[14-79]|
               7[0-246-9]|
@@ -20387,9 +20524,9 @@
                nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)">
       <availableFormats>
         <!-- Following formatting of online yellow pages www.leonedirect.com -->
-             <numberFormat pattern="(\d{2})(\d{6})">
-               <format>$1 $2</format>
-             </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{6})">
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[2-578]\d{7}</nationalNumberPattern>
@@ -20402,16 +20539,17 @@
       <mobile>
         <!-- Adding prefix 50 because it was found in online numbers and this is supported by
              http://www.wtng.info/wtng-232-sl.html - although the data may be outdated, since no
-             further information about Datatel can be found. -->
+             further information about Datatel can be found. Adding prefix 79 since it was launched
+             by Airtel on Feb 2nd 2012. -->
         <nationalNumberPattern>
           (?:
             25|
             3[03]|
             44|
             5[056]|
-            7[6-8]|
+            7[6-9]|
             88
-          )[1-9]\d{5}
+          )\d{6}
         </nationalNumberPattern>
         <exampleNumber>25123456</exampleNumber>
       </mobile>
@@ -20526,7 +20664,7 @@
         <!-- The patterns from the ITU document seem too restrictive, based on numbers found in
              online searches and phones that SMSs have been successfully received from, so the
              ranges, have been extended to include 76 5[4-7], 76 6[3-5] and 77 01, 1[239], 2[89],
-             3[49], 4[7-9], 7[4-7], 8[39] and 9\d. -->
+             3[49], 4[7-9], 7[4-7], 8[2-9] and 9\d. -->
         <nationalNumberPattern>
           7(?:
             0[1256]0|
@@ -20542,8 +20680,7 @@
             )|
             7(?:
               01|
-              [12-79]\d|
-              8[0139]
+              [1-9]\d
             )
           )\d{5}
         </nationalNumberPattern>
@@ -22265,7 +22402,7 @@
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Ranges with prefixes 20[3-5] are "not yet operational" as of Nov. 2011. -->
+        <!-- Ranges with prefixes 20[35] are "not yet operational" as of Feb. 2012. -->
         <nationalNumberPattern>
           20(?:
             [014]\d{2}|
@@ -22707,7 +22844,7 @@
               )|
               4(?:
                 2\d|
-                3[1-4579]|
+                3[1-579]|
                 7[1-79]
               )|
               5(?: