Snap for 8570526 from 3590012041750ae2eda6d371c1fab32ea5799f97 to mainline-networking-releaseaml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010android13-mainline-networking-release

Change-Id: I3790cffbaa756daf91b22338a4a23f5024b71a4a

1044 files changed, 654 insertions, 300 deletions

diff --git a/README.android b/README.android
index 691c694a..75c93203 100644
--- a/README.android
+++ b/README.android
@@ -1,5 +1,5 @@
 URL: https://github.com/googlei18n/libphonenumber
-Version: 8.10.21
+Version: 8.12.46
 License: Apache 2
 Description: Google Phone Number Library.
 
diff --git a/README.version b/README.version
index 5fcd142e..e08ddb22 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
 URL: https://github.com/googlei18n/libphonenumber/
-Version: 8.10.21
+Version: 8.12.46
 BugComponent: 24949
diff --git a/build.xml b/build.xml
index aae3fa96..1b89bf23 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
   </path>
   <path id="test.classpath">
     <pathelement location="${classes.dir}"/>
-    <pathelement location="${lib.dir}/junit/junit-4.8.1.jar"/>
+    <pathelement location="${lib.dir}/junit/junit-4.13.1.jar"/>
     <pathelement location="${jar.dir}/${ant.project.name}-test.jar"/>
     <fileset dir="${lib.dir}">
       <include name="**/*.jar"/>
diff --git a/carrier/pom.xml b/carrier/pom.xml
index 01f48746..0ed9500a 100644
--- a/carrier/pom.xml
+++ b/carrier/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.117</version>
+  <version>1.172</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.10.21</version>
+    <version>8.12.46</version>
   </parent>
 
   <build>
@@ -55,12 +55,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.10.21</version>
+      <version>8.12.46</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.127</version>
+      <version>2.182</version>
     </dependency>
   </dependencies>
 
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
index 2c5a2773..8ffce001 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
index df84f7cd..b1294325 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
index 005beb15..778592a9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
index 91103eac..fcb01ab7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en
new file mode 100644
index 00000000..84edc5d1
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1340_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
index 1eeec313..39013444 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
index 5bd3804e..3a4269aa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
index bf8f9982..f9651eac 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en
new file mode 100644
index 00000000..0eb19c8b
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1659_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en
new file mode 100644
index 00000000..af26fb5b
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1664_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en
new file mode 100644
index 00000000..a18d6029
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1670_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
index d74c9439..6279e1eb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
index abe55f5a..14e7a3a6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
index 72c1d900..5a48a0ea 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1767_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
index a34eb00c..c8fd0d34 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1784_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
index 60133a94..01460ed7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
index 939ddcc8..9696a5e3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1869_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
index 6bbdfdd1..fb09c667 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
index cb319d8e..b8efb4b6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/211_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
index f5ded4b6..05983c7e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
index ec131c75..b70c0e88 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/213_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
index 1246c7d1..852ade5d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
new file mode 100644
index 00000000..336e9e86
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
index 7dd6e802..dfa60c96 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
index a9c14e02..f5314b2e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
index 37602e07..f3f579ba 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/222_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
index c767ada6..5c04fd1f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
index d6899e3a..7045fc33 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/224_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
index a83f0dc7..516c1460 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
index ddf51281..88130d58 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
index 144626f3..035235c3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
index 9f3a6da8..bf2994f5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
index 67626aea..491a1575 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
index 3f1bcb57..43c651d5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
index 3ecd9c30..652ad437 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
index f27a0853..66bb3700 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
index ef04f082..81766ae5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
index 99284df2..13f66097 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
index eb8493f9..0e4a45c7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
index 6619b943..729f6508 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
index c8b833ed..61468551 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/238_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
index 95c961d5..b3d49835 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/240_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
index cc21ce9d..835ed989 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
index 882427c0..ad8d9b83 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
index 0ff477db..4eab9760 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en
new file mode 100644
index 00000000..c02a438d
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/246_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en
new file mode 100644
index 00000000..4318f70a
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/247_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
index eb39a961..21e68498 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
index 970b425b..a2cfbf2c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/250_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
index 184a994f..c3efeaa3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
index 1f45d5db..60412710 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
index 26d5efd0..9d339808 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
index 961b888d..61a11519 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
index 3a50b7c9..4980e391 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
index 3b63efae..c7aa5e64 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
index 38a8db07..a36efe99 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
index 2d04c69c..96a7b5b2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
index 39fd4d33..1df02841 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
index 613eddac..f08ca8a7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en
new file mode 100644
index 00000000..b28fda4e
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/266_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
index 3a75c117..b9903a1f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
index 6c836f25..9acfa852 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
index 6e122f69..75fee289 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en
new file mode 100644
index 00000000..557c7292
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/290_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en
new file mode 100644
index 00000000..123f4859
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/291_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
index 52780a71..15cca8e9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
index b9653a4c..e3a67dac 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
index 32588d79..bdff7482 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
index bd7a9ca9..594eba31 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
index 563ceadb..6df37525 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
index 25c1c4ab..0438dc33 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
index 26587f15..42dbe35a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
index d242cf24..194932b6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
index 0db21eb4..6e730420 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
index b003beb1..28a1c56b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
index f6c24f44..15476176 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
index b67d25fe..b9eb00c0 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/356_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
index 22041f6e..24f1123d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
index c6596076..a589090f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
index 73052257..32ba7908 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/36_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
index ba317867..32cd4aac 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
index e3dfb5b0..b07561a9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
index 5648bb4f..21224a36 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
index 2003d644..0faea911 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en
new file mode 100644
index 00000000..bc38b587
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/377_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en
new file mode 100644
index 00000000..437de7f1
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/378_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
index a1d0dbd0..e536083a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
index 79ec6c5d..9bcdc608 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
index 228363ab..3e9b2db4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
index b245c62d..c0b89dec 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
index 77a0a929..c430180b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
index 3a76eb43..be11c922 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
index 1bc4394e..ba3c08a8 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
index 6d778028..058355f2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
index acda9c79..a17f7d80 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
index 1a1cae93..83605f0a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
index 16870077..c8a8de3c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
index 4fbfb447..617e4c02 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
index 955ec7f8..79b9f945 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
index 7f4a4eca..dbc8c524 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
new file mode 100644
index 00000000..719c0bc4
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
index ae761503..5917b78b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
index 50782a21..66546b28 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
index 4c49f5f8..922143ad 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en
new file mode 100644
index 00000000..107bcf55
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/500_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
new file mode 100644
index 00000000..e3a6bc2d
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
index 3a44b9a3..720d22a5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
index 1f612c91..57520a34 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en
new file mode 100644
index 00000000..91fc19fe
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/504_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
index e46e4551..76061969 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
index 043e6a11..b0c2bb90 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
index da296559..9d4d7daa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
index 031b31f6..a651fce2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
index bada8bbf..99508fb9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
index 8705fc9c..81e6fa08 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
index 4b5a57ef..67386fe3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
index ffd1595a..811c55d2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
index 46290b99..8679ecfe 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
index eb754428..721044b6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
index 0cf01c9f..69ac80f5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
index 903bc1dd..9edf3f72 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
index 20ef1b89..7983842b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
index 456c3d7f..21ccd71c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
index ea3fd501..e4f813de 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
index 1301c8e1..e953b26d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
index 72798335..28ea3fc5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
index 4c17f45c..f8608c15 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
index 1cb58a17..2bf7b985 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
index c72c275d..0b2fda42 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/64_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
index 983db367..9dc543a2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
index d45eb62d..a3a918a3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
index 151186cd..646a59b9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en
new file mode 100644
index 00000000..2fb04dd4
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/672_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
index 921b8b11..7f184305 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
index 21669795..94441786 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
index ce89621d..328156d4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en
new file mode 100644
index 00000000..9359f7c7
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
index 3921eeaa..85f34571 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
index 2886107b..adb64379 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en
new file mode 100644
index 00000000..48e56d27
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/681_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
new file mode 100644
index 00000000..8b85ff27
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en
new file mode 100644
index 00000000..35daa5a6
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/683_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
index e95b3a40..623161fb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
index c461702c..355e346d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en
new file mode 100644
index 00000000..0e76c744
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/687_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en
new file mode 100644
index 00000000..8b864ce7
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/690_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en
new file mode 100644
index 00000000..ff876521
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/691_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en
new file mode 100644
index 00000000..f0f063cb
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
index e2cdb833..25861521 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
index b4e8b0ed..eca5c78a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en
new file mode 100644
index 00000000..95424ab2
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
new file mode 100644
index 00000000..defe2bcf
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
new file mode 100644
index 00000000..3cc62177
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
index 5e49c0c6..080e3c4f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en
new file mode 100644
index 00000000..3182b3e8
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/850_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
index e9a42e6e..6828fc69 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
index 2699f49a..7669b5b7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
index 3bf7b2c3..cc483c3f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
index 81dc1f0e..72797dcf 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
index 85e5133e..d4b5380f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
index fbd3f01f..5ac1d883 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
index 0e560065..1e2437c1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
index cbd3caec..8e6daef3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en
new file mode 100644
index 00000000..95bb8c85
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/881_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
new file mode 100644
index 00000000..0a28266b
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
index 332bdd39..db2bf0ea 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
index 17cd2a50..98195276 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
index 3206761a..97d3b5aa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
index a34ca1d7..2e37c23a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
index b40e320c..c5b9552e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
index 971f6208..db3765dd 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
index dccf09ef..897de587 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
index b3160c2d..0166f0d2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
index 6af4445f..bc48c09b 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
index efccdb08..593e0c46 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
index 6e77a4dd..269d702e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
index d5bcb56c..a4c0af49 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
index 70fea2c7..b0304713 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
index 73f25d38..b6f46de3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
index 264e6732..5471ae19 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/970_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
index ac8fabae..862fba3f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
index 0a4e1d0d..b1663fe4 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
index d3f91346..c34cabb5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
index 12572c5a..5e41d40c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
index be297ff4..24d29024 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
index 874ba2b8..b7635df2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
index c360caa1..74499f5a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
index 078b3ffd..337c3461 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
index 08828112..f6e3a170 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
index c767ca16..9275bbed 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
index de487888..1a790e74 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
index 67489f3f..d551c65f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
index 0fff3345..9ba15aba 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
diff --git a/demo/build.xml b/demo/build.xml
index b9ed0cb5..5cc93a78 100644
--- a/demo/build.xml
+++ b/demo/build.xml
@@ -30,7 +30,7 @@
       </fileset>
     </copy>
     <javac srcdir="src" destdir="war/WEB-INF/classes" classpathref="project.classpath" debug="on"
-           includeAntRuntime="false"/>
+           includeAntRuntime="false" source="1.8" target="1.8"/>
   </target>
 
   <target name="runserver" depends="compile" description="Starts the development server.">
diff --git a/demo/pom.xml b/demo/pom.xml
index 9367b3b0..775474c8 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.10.21</version>
+  <version>8.12.46</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.10.21</version>
+    <version>8.12.46</version>
   </parent>
 
   <properties>
@@ -25,8 +25,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-	  <target>1.6</target>
+          <source>1.7</source>
+	  <target>1.7</target>
 	  <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.3.2</version>
+      <version>2.7</version>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
@@ -89,17 +89,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.10.21</version>
+      <version>8.12.46</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.127</version>
+      <version>2.182</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.117</version>
+      <version>1.172</version>
     </dependency>
   </dependencies>
 
diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
index 9dd9105b..40f0fa8f 100644
--- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
+++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
@@ -28,28 +28,26 @@ import com.google.i18n.phonenumbers.PhoneNumberToTimeZonesMapper;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.ValidationResult;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 import com.google.i18n.phonenumbers.ShortNumberInfo;
 import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
-
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.util.Streams;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Locale;
 import java.util.StringTokenizer;
-
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.fileupload.FileItemIterator;
+import org.apache.commons.fileupload.FileItemStream;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload.util.Streams;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 
 /**
  * A servlet that accepts requests that contain strings representing a phone number and a default
@@ -61,10 +59,11 @@ import javax.servlet.http.HttpServletResponse;
 public class PhoneNumberParserServlet extends HttpServlet {
   private PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
   private ShortNumberInfo shortInfo = ShortNumberInfo.getInstance();
+
   public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     String phoneNumber = null;
     String defaultCountry = null;
-    String languageCode = "en";  // Default languageCode to English if nothing is entered.
+    String languageCode = "en"; // Default languageCode to English if nothing is entered.
     String regionCode = "";
     String fileContents = null;
     ServletFileUpload upload = new ServletFileUpload();
@@ -106,16 +105,14 @@ public class PhoneNumberParserServlet extends HttpServlet {
     if (fileContents == null || fileContents.length() == 0) {
       // Redirect to a URL with the given input encoded in the query parameters.
       Locale geocodingLocale = new Locale(languageCode, regionCode);
-      resp.sendRedirect(getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale,
-          false /* absoluteURL */));
+      resp.sendRedirect(
+          getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale, false /* absoluteURL */));
     } else {
       resp.getWriter().println(getOutputForFile(defaultCountry, fileContents));
     }
   }
 
-  /**
-   * Handle the get request to get information about a number based on query parameters.
-   */
+  /** Handle the get request to get information about a number based on query parameters. */
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     String phoneNumber = req.getParameter("number");
     if (phoneNumber == null) {
@@ -128,20 +125,21 @@ public class PhoneNumberParserServlet extends HttpServlet {
     String geocodingParam = req.getParameter("geocodingLocale");
     Locale geocodingLocale;
     if (geocodingParam == null) {
-      geocodingLocale = ENGLISH;  // Default languageCode to English if nothing is entered.
+      geocodingLocale = ENGLISH; // Default languageCode to English if nothing is entered.
     } else {
       geocodingLocale = Locale.forLanguageTag(geocodingParam);
     }
     resp.setContentType("text/html");
     resp.setCharacterEncoding(UTF_8.name());
-    resp.getWriter().println(
-        getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale));
+    resp.getWriter()
+        .println(getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale));
   }
 
   private StringBuilder getOutputForFile(String defaultCountry, String fileContents) {
-    StringBuilder output = new StringBuilder(
-        "<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:"
-        + "</TITLE></HEAD><BODY>");
+    StringBuilder output =
+        new StringBuilder(
+            "<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:"
+                + "</TITLE></HEAD><BODY>");
     output.append("<TABLE align=center border=1>");
     output.append("<TH align=center>ID</TH>");
     output.append("<TH align=center>Raw phone number</TH>");
@@ -155,25 +153,31 @@ public class PhoneNumberParserServlet extends HttpServlet {
       phoneNumberId++;
       output.append("<TR>");
       output.append("<TD align=center>").append(phoneNumberId).append(" </TD> \n");
-      output.append("<TD align=center>").append(
-          StringEscapeUtils.escapeHtml(numberStr)).append(" </TD> \n");
+      output
+          .append("<TD align=center>")
+          .append(StringEscapeUtils.escapeHtml(numberStr))
+          .append(" </TD> \n");
       try {
         PhoneNumber number = phoneUtil.parseAndKeepRawInput(numberStr, defaultCountry);
         boolean isNumberValid = phoneUtil.isValidNumber(number);
-        String prettyFormat = isNumberValid
-            ? phoneUtil.formatInOriginalFormat(number, defaultCountry)
-            : "invalid";
-        String internationalFormat = isNumberValid
-            ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL)
-            : "invalid";
+        String prettyFormat =
+            isNumberValid ? phoneUtil.formatInOriginalFormat(number, defaultCountry) : "invalid";
+        String internationalFormat =
+            isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL) : "invalid";
 
-        output.append("<TD align=center>").append(
-            StringEscapeUtils.escapeHtml(prettyFormat)).append(" </TD> \n");
-        output.append("<TD align=center>").append(
-            StringEscapeUtils.escapeHtml(internationalFormat)).append(" </TD> \n");
+        output
+            .append("<TD align=center>")
+            .append(StringEscapeUtils.escapeHtml(prettyFormat))
+            .append(" </TD> \n");
+        output
+            .append("<TD align=center>")
+            .append(StringEscapeUtils.escapeHtml(internationalFormat))
+            .append(" </TD> \n");
       } catch (NumberParseException e) {
-        output.append("<TD align=center colspan=2>").append(
-            StringEscapeUtils.escapeHtml(e.toString())).append(" </TD> \n");
+        output
+            .append("<TD align=center colspan=2>")
+            .append(StringEscapeUtils.escapeHtml(e.toString()))
+            .append(" </TD> \n");
       }
       output.append("</TR>");
     }
@@ -188,26 +192,27 @@ public class PhoneNumberParserServlet extends HttpServlet {
     output.append("</TR>");
   }
 
-  /**
-   * Returns a stable URL pointing to the result page for the given input.
-   */
+  /** Returns a stable URL pointing to the result page for the given input. */
   private String getPermaLinkURL(
       String phoneNumber, String defaultCountry, Locale geocodingLocale, boolean absoluteURL) {
     // If absoluteURL is false, generate a relative path. Otherwise, produce an absolute URL.
-    StringBuilder permaLink = new StringBuilder(
-        absoluteURL ? "http://libphonenumber.appspot.com/phonenumberparser" : "/phonenumberparser");
+    StringBuilder permaLink =
+        new StringBuilder(
+            absoluteURL
+                ? "http://libphonenumber.appspot.com/phonenumberparser"
+                : "/phonenumberparser");
     try {
       permaLink.append(
           "?number=" + URLEncoder.encode(phoneNumber != null ? phoneNumber : "", UTF_8.name()));
       if (defaultCountry != null && !defaultCountry.isEmpty()) {
         permaLink.append("&country=" + URLEncoder.encode(defaultCountry, UTF_8.name()));
       }
-      if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage()) ||
-          !geocodingLocale.getCountry().isEmpty()) {
-        permaLink.append("&geocodingLocale=" +
-            URLEncoder.encode(geocodingLocale.toLanguageTag(), UTF_8.name()));
+      if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage())
+          || !geocodingLocale.getCountry().isEmpty()) {
+        permaLink.append(
+            "&geocodingLocale=" + URLEncoder.encode(geocodingLocale.toLanguageTag(), UTF_8.name()));
       }
-    } catch(UnsupportedEncodingException e) {
+    } catch (UnsupportedEncodingException e) {
       // UTF-8 is guaranteed in Java, so this should be impossible.
       throw new AssertionError(e);
     }
@@ -215,21 +220,21 @@ public class PhoneNumberParserServlet extends HttpServlet {
   }
 
   private static final String NEW_ISSUE_BASE_URL =
-    "https://issuetracker.google.com/issues/new?component=192347&title=";
+      "https://issuetracker.google.com/issues/new?component=192347&title=";
 
-  /**
-   * Returns a link to create a new github issue with the relevant information.
-   */
+  /** Returns a link to create a new github issue with the relevant information. */
   private String getNewIssueLink(
       String phoneNumber, String defaultCountry, Locale geocodingLocale) {
     boolean hasDefaultCountry = !defaultCountry.isEmpty() && defaultCountry != "ZZ";
-    String issueTitle = "Validation issue with " + phoneNumber
-        + (hasDefaultCountry ? " (" + defaultCountry + ")" : "");
+    String issueTitle =
+        "Validation issue with "
+            + phoneNumber
+            + (hasDefaultCountry ? " (" + defaultCountry + ")" : "");
 
     String newIssueLink = NEW_ISSUE_BASE_URL;
     try {
       newIssueLink += URLEncoder.encode(issueTitle, UTF_8.name());
-    } catch(UnsupportedEncodingException e) {
+    } catch (UnsupportedEncodingException e) {
       // UTF-8 is guaranteed in Java, so this should be impossible.
       throw new AssertionError(e);
     }
@@ -243,15 +248,16 @@ public class PhoneNumberParserServlet extends HttpServlet {
   private StringBuilder getOutputForSingleNumber(
       String phoneNumber, String defaultCountry, Locale geocodingLocale) {
     StringBuilder output = new StringBuilder("<HTML><HEAD>");
-    output.append(
-        "<LINK type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />");
+    output.append("<LINK type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />");
     output.append("</HEAD>");
     output.append("<BODY>");
     output.append("Phone Number entered: " + StringEscapeUtils.escapeHtml(phoneNumber) + "<BR>");
-    output.append("defaultCountry entered: " + StringEscapeUtils.escapeHtml(defaultCountry)
-        + "<BR>");
-    output.append("Language entered: "
-        + StringEscapeUtils.escapeHtml(geocodingLocale.toLanguageTag()) + "<BR>");
+    output.append(
+        "defaultCountry entered: " + StringEscapeUtils.escapeHtml(defaultCountry) + "<BR>");
+    output.append(
+        "Language entered: "
+            + StringEscapeUtils.escapeHtml(geocodingLocale.toLanguageTag())
+            + "<BR>");
     try {
       PhoneNumber number = phoneUtil.parseAndKeepRawInput(phoneNumber, defaultCountry);
       output.append("<DIV>");
@@ -276,24 +282,33 @@ public class PhoneNumberParserServlet extends HttpServlet {
       output.append("<TABLE border=1>");
       output.append("<TR><TD colspan=2>Validation Results</TD></TR>");
       appendLine("Result from isPossibleNumber()", Boolean.toString(isPossible), output);
-      if (!isPossible) {
-        appendLine("Result from isPossibleNumberWithReason()",
-                   phoneUtil.isPossibleNumberWithReason(number).toString(), output);
-        output.append("<TR><TD colspan=2>Note: numbers that are not possible have type " +
-                      "UNKNOWN, an unknown region, and are considered invalid.</TD></TR>");
-      } else {
-        appendLine("Result from isValidNumber()", Boolean.toString(isNumberValid), output);
-        if (isNumberValid) {
-          if (hasDefaultCountry) {
-            appendLine(
-                "Result from isValidNumberForRegion()",
-                Boolean.toString(phoneUtil.isValidNumberForRegion(number, defaultCountry)),
-                output);
+      if (isPossible) {
+        if (phoneUtil.isPossibleNumberWithReason(number)
+            == ValidationResult.IS_POSSIBLE_LOCAL_ONLY) {
+          appendLine("Result from isPossibleNumberWithReason()", "IS_POSSIBLE_LOCAL_ONLY", output);
+          output.append(
+              "<TR><TD colspan=2>Number is considered invalid as it is "
+                  + "not a possible national number.</TD></TR>");
+        } else {
+          appendLine("Result from isValidNumber()", Boolean.toString(isNumberValid), output);
+          if (isNumberValid && hasDefaultCountry) {
+              appendLine(
+                  "Result from isValidNumberForRegion()",
+                  Boolean.toString(phoneUtil.isValidNumberForRegion(number, defaultCountry)),
+                  output);
           }
+          String region = phoneUtil.getRegionCodeForNumber(number);
+          appendLine("Phone Number region", region == null ? "" : region, output);
+          appendLine("Result from getNumberType()", numberType.toString(), output);
         }
-        String region = phoneUtil.getRegionCodeForNumber(number);
-        appendLine("Phone Number region", region == null ? "" : region, output);
-        appendLine("Result from getNumberType()", numberType.toString(), output);
+      } else {
+        appendLine(
+            "Result from isPossibleNumberWithReason()",
+            phoneUtil.isPossibleNumberWithReason(number).toString(),
+            output);
+        output.append(
+            "<TR><TD colspan=2>Note: Numbers that are not possible have type UNKNOWN,"
+                + " an unknown region, and are considered invalid.</TD></TR>");
       }
       output.append("</TABLE>");
       output.append("</DIV>");
@@ -303,20 +318,25 @@ public class PhoneNumberParserServlet extends HttpServlet {
         output.append("<TABLE border=1>");
         output.append("<TR><TD colspan=2>Short Number Results</TD></TR>");
         boolean isPossibleShort = shortInfo.isPossibleShortNumber(number);
-        appendLine("Result from isPossibleShortNumber()",
-            Boolean.toString(isPossibleShort), output);
+        appendLine(
+            "Result from isPossibleShortNumber()", Boolean.toString(isPossibleShort), output);
         if (isPossibleShort) {
-          appendLine("Result from isValidShortNumber()",
-              Boolean.toString(shortInfo.isValidShortNumber(number)), output);
+          appendLine(
+              "Result from isValidShortNumber()",
+              Boolean.toString(shortInfo.isValidShortNumber(number)),
+              output);
           if (hasDefaultCountry) {
             boolean isPossibleShortForRegion =
                 shortInfo.isPossibleShortNumberForRegion(number, defaultCountry);
-            appendLine("Result from isPossibleShortNumberForRegion()",
-                Boolean.toString(isPossibleShortForRegion), output);
+            appendLine(
+                "Result from isPossibleShortNumberForRegion()",
+                Boolean.toString(isPossibleShortForRegion),
+                output);
             if (isPossibleShortForRegion) {
-              appendLine("Result from isValidShortNumberForRegion()",
-                  Boolean.toString(shortInfo.isValidShortNumberForRegion(number,
-                      defaultCountry)), output);
+              appendLine(
+                  "Result from isValidShortNumberForRegion()",
+                  Boolean.toString(shortInfo.isValidShortNumberForRegion(number, defaultCountry)),
+                  output);
             }
           }
         }
@@ -327,11 +347,12 @@ public class PhoneNumberParserServlet extends HttpServlet {
       output.append("<DIV>");
       output.append("<TABLE border=1>");
       output.append("<TR><TD colspan=2>Formatting Results</TD></TR>");
-      appendLine("E164 format",
-                 isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.E164) : "invalid",
-                 output);
-      appendLine("Original format",
-                 phoneUtil.formatInOriginalFormat(number, defaultCountry), output);
+      appendLine(
+          "E164 format",
+          isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.E164) : "invalid",
+          output);
+      appendLine(
+          "Original format", phoneUtil.formatInOriginalFormat(number, defaultCountry), output);
       appendLine("National format", phoneUtil.format(number, PhoneNumberFormat.NATIONAL), output);
       appendLine(
           "International format",
@@ -357,8 +378,8 @@ public class PhoneNumberParserServlet extends HttpServlet {
         // Note this doesn't handle supplementary characters, but it shouldn't be a big deal as
         // there are no dial-pad characters in the supplementary range.
         char inputChar = phoneNumber.charAt(i);
-        appendLine("Char entered: '" + inputChar + "' Output: ",
-                   formatter.inputDigit(inputChar), output);
+        appendLine(
+            "Char entered: '" + inputChar + "' Output: ", formatter.inputDigit(inputChar), output);
       }
       output.append("</TABLE>");
       output.append("</DIV>");
@@ -369,8 +390,8 @@ public class PhoneNumberParserServlet extends HttpServlet {
         output.append("<TR><TD colspan=2>PhoneNumberOfflineGeocoder Results</TD></TR>");
         appendLine(
             "Location",
-            PhoneNumberOfflineGeocoder.getInstance().getDescriptionForNumber(
-                number, geocodingLocale),
+            PhoneNumberOfflineGeocoder.getInstance()
+                .getDescriptionForNumber(number, geocodingLocale),
             output);
         output.append("</TABLE>");
         output.append("</DIV>");
@@ -385,9 +406,9 @@ public class PhoneNumberParserServlet extends HttpServlet {
         output.append("</TABLE>");
         output.append("</DIV>");
 
-        if (numberType == PhoneNumberType.MOBILE ||
-            numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE ||
-            numberType == PhoneNumberType.PAGER) {
+        if (numberType == PhoneNumberType.MOBILE
+            || numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE
+            || numberType == PhoneNumberType.PAGER) {
           output.append("<DIV>");
           output.append("<TABLE border=1>");
           output.append("<TR><TD colspan=2>PhoneNumberToCarrierMapper Results</TD></TR>");
@@ -403,10 +424,14 @@ public class PhoneNumberParserServlet extends HttpServlet {
       String newIssueLink = getNewIssueLink(phoneNumber, defaultCountry, geocodingLocale);
       String guidelinesLink =
           "https://github.com/google/libphonenumber/blob/master/CONTRIBUTING.md";
-      output.append("<b style=\"color:red\">File an issue</b>: by clicking on "
-          + "<a target=\"_blank\" href=\"" + newIssueLink + "\">this link</a>, I confirm that I "
-          + "have read the <a target=\"_blank\" href=\"" + guidelinesLink
-          + "\">contributor's guidelines</a>.");
+      output.append(
+          "<b style=\"color:red\">File an issue</b>: by clicking on "
+              + "<a target=\"_blank\" href=\""
+              + newIssueLink
+              + "\">this link</a>, I confirm that I "
+              + "have read the <a target=\"_blank\" href=\""
+              + guidelinesLink
+              + "\">contributor's guidelines</a>.");
     } catch (NumberParseException e) {
       output.append(StringEscapeUtils.escapeHtml(e.toString()));
     }
diff --git a/demo/war/WEB-INF/lib/servlet-api-2.5.jar b/demo/war/WEB-INF/lib/servlet-api-2.5.jar
new file mode 100644
index 00000000..fb524934
--- /dev/null
+++ b/demo/war/WEB-INF/lib/servlet-api-2.5.jar
diff --git a/geocoder/pom.xml b/geocoder/pom.xml
index f6cd9b0c..37c7cc32 100644
--- a/geocoder/pom.xml
+++ b/geocoder/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.127</version>
+  <version>2.182</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.10.21</version>
+    <version>8.12.46</version>
   </parent>
 
   <build>
@@ -63,12 +63,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.10.21</version>
+      <version>8.12.46</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.127</version>
+      <version>2.182</version>
     </dependency>
   </dependencies>
 
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
index e3f0c0b8..f029b461 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en
new file mode 100644
index 00000000..a9ac6ec4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1326_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en
new file mode 100644
index 00000000..04c93975
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1340_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
index cc5f70e4..bd11fc2e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en
new file mode 100644
index 00000000..7c1b37ea
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1367_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en
new file mode 100644
index 00000000..7107ecea
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1368_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
deleted file mode 100644
index 024ff727..00000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
+++ /dev/null
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en
new file mode 100644
index 00000000..6924decd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1447_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en
new file mode 100644
index 00000000..352dd5eb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1448_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en
new file mode 100644
index 00000000..435c6f78
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1464_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en
new file mode 100644
index 00000000..6f081063
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1474_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en
new file mode 100644
index 00000000..0f8e15b8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1572_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en
new file mode 100644
index 00000000..7d5f7c56
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1582_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en
new file mode 100644
index 00000000..0c78c721
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1659_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en
new file mode 100644
index 00000000..6d2e0605
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1672_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en
new file mode 100644
index 00000000..8cc22d56
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1771_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en
new file mode 100644
index 00000000..32e5f3e2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1839_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en
new file mode 100644
index 00000000..a9faf2a6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1840_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
index 4440fe70..42c43eb8 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
index 05fbabf3..d5c0c4ae 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en
new file mode 100644
index 00000000..523a8aaf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1945_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
index b89c9e09..2ae8176b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
index f6b11763..9016b0d0 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
index 7a1379ca..9bdb5872 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
index 9af2d13e..10e20d19 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
index 8c815423..b6ec6906 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
index 6ef28be7..81be19a1 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
index 87a8cc14..1936bb2d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
index 94734b8b..c0340bfb 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
index 747091b2..47e1916f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
index 416e875f..5bafef13 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
index da1af172..ef8dd438 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en
new file mode 100644
index 00000000..314832a8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/236_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
index 092d85a4..6367de86 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
index 08484279..64095f9a 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
index 007eb7c9..f2b6c5ad 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
index 7b2d9fc2..7b8224fd 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
index 80432934..9826d454 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
index 0a066119..066ad251 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
index 6aea6389..21fffa1a 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
index 1f877a67..06afe7fe 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
index e7f6f165..c94e1399 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
index e6424bbf..eb983e1c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
index 77a25fc4..4e81c8af 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
index 652bfda2..3ab2985b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
index 4c80c16c..e0bdb810 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
index ad888cc7..26e14b49 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
index b207f523..d9fdcd03 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
index 2e85aa2a..15b7906f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
index f2fffb5a..b49d48c9 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
index eeee7e45..658550cd 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
index 1d11627d..d2333d4f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
index 9f0226f1..7d523180 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
index 4626068f..32b5f398 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
new file mode 100644
index 00000000..115cf8f0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
index e3b6913d..2d834341 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
index 5a5dc092..e513c686 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
index 40fd28d1..14c8da37 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
index 3e19613f..b40793e7 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
index 0e30c333..35bada2d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
deleted file mode 100644
index 31a27a8d..00000000
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
+++ /dev/null
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
index 91d9f47e..828e127d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
index 428b8bf3..ae26ed34 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
index 11f59e47..0c7aaaed 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
index d8eabc44..d9487c95 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
index c8e25d49..e51cd55d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
index 7f5de7c7..7fc1659b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
index 77d1fee9..53245827 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
index 3955d713..ce165988 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
index a6724ae3..f0e057e3 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
index b453a4e5..45107eed 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
index 347d96b7..ec254fad 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
index 2bf005e9..54ba222e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
index 5e85d0c8..4def98a7 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en
new file mode 100644
index 00000000..551bd93b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/593_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en
new file mode 100644
index 00000000..e6307d46
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/595_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en
new file mode 100644
index 00000000..3d486dbb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/598_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
index 54bef5f3..4db9fde7 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
index 1e213743..3b71403f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
index 123a41c4..e56bfb93 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en
new file mode 100644
index 00000000..a7d08a1d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/63_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
index 8e564259..835a1aad 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
index cb2807d7..4a5546c7 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
index 5e86e0b5..d68b6237 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en
new file mode 100644
index 00000000..2483baa2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/670_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en
new file mode 100644
index 00000000..4f754735
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/672_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
new file mode 100644
index 00000000..1c6166b9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en
new file mode 100644
index 00000000..96bb0674
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/678_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
new file mode 100644
index 00000000..698326fb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
index 64d9cd49..3a4b0119 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
new file mode 100644
index 00000000..8efd06dc
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en
new file mode 100644
index 00000000..f437acde
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/685_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
index 1697bec9..32876c45 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en
new file mode 100644
index 00000000..95e83155
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/689_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en
new file mode 100644
index 00000000..e0aea52f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/690_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
index 19e0566c..efc7c54e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
index 7ac8a630..afce4a6d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
index 8adf5298..d5d7ac5f 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
index 2153b5a0..d301aa0b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en
new file mode 100644
index 00000000..dd382d05
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/850_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
index febe1918..14db15a8 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
index ef765f55..fdaa487d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
index e2506851..923fe0a3 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
index 3ab469b7..4800528b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en
new file mode 100644
index 00000000..8561f835
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/92_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
index 7fab12a6..886e42ab 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en
new file mode 100644
index 00000000..fde89900
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/961_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
index 37a2bf85..c4d61bc1 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en
new file mode 100644
index 00000000..065e3561
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/963_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en
new file mode 100644
index 00000000..3d2ffc80
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/967_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en
new file mode 100644
index 00000000..43a8e954
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/970_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
new file mode 100644
index 00000000..48273faf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en
new file mode 100644
index 00000000..cd0e4cf5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/993_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
index 69468e9e..b3eadf7c 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en
new file mode 100644
index 00000000..89b3600e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/995_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
index 46b794d7..16d44e69 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 7c428d0f..49659897 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
index 330087d8..a2c80e64 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml
index 32f78ea4..47770b85 100644
--- a/internal/prefixmapper/pom.xml
+++ b/internal/prefixmapper/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.127</version>
+  <version>2.182</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.10.21</version>
+    <version>8.12.46</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.10.21</version>
+      <version>8.12.46</version>
     </dependency>
   </dependencies>
 
diff --git a/lib/junit-4.13.1.jar b/lib/junit-4.13.1.jar
new file mode 100644
index 00000000..b376ffc1
--- /dev/null
+++ b/lib/junit-4.13.1.jar
diff --git a/lib/junit-4.8.1.jar b/lib/junit-4.8.1.jar
deleted file mode 100644
index 524cd65c..00000000
--- a/lib/junit-4.8.1.jar
+++ /dev/null
diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml
index c673de18..eb163163 100644
--- a/libphonenumber/pom.xml
+++ b/libphonenumber/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>8.10.21</version>
+  <version>8.12.46</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.10.21</version>
+    <version>8.12.46</version>
   </parent>
 
   <build>
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java b/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
index cdbd72d1..834c9d80 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
@@ -26,9 +26,9 @@ import java.util.Set;
 public class AlternateFormatsCountryCodeSet {
   // A set of all country codes for which data is available.
   static Set<Integer> getCountryCodeSet() {
-    // The capacity is set to 62 as there are 47 different entries,
+    // The capacity is set to 61 as there are 46 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<Integer> countryCodeSet = new HashSet<Integer>(62);
+    Set<Integer> countryCodeSet = new HashSet<Integer>(61);
 
     countryCodeSet.add(7);
     countryCodeSet.add(27);
@@ -46,7 +46,6 @@ public class AlternateFormatsCountryCodeSet {
     countryCodeSet.add(58);
     countryCodeSet.add(61);
     countryCodeSet.add(62);
-    countryCodeSet.add(63);
     countryCodeSet.add(64);
     countryCodeSet.add(66);
     countryCodeSet.add(81);
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index a0d9957b..be11be57 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -62,7 +62,7 @@ public class AsYouTypeFormatter {
   // code, from the national number.
   private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
   private static final PhoneMetadata EMPTY_METADATA =
-      new PhoneMetadata().setInternationalPrefix("NA");
+      PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build();
   private PhoneMetadata defaultMetadata;
   private PhoneMetadata currentMetadata;
 
@@ -70,10 +70,12 @@ public class AsYouTypeFormatter {
   // used by the AYTF. It is eligible when the format element under numberFormat contains groups of
   // the dollar sign followed by a single digit, separated by valid phone number punctuation. This
   // prevents invalid punctuation (such as the star sign in Israeli star numbers) getting into the
-  // output of the AYTF.
+  // output of the AYTF. We require that the first group is present in the output pattern to ensure
+  // no data is lost while formatting; when we format as you type, this should always be the case.
   private static final Pattern ELIGIBLE_FORMAT_PATTERN =
       Pattern.compile("[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*"
-          + "(\\$\\d" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)+");
+          + "\\$1" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*(\\$\\d"
+          + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)*");
   // A set of characters that, if found in a national prefix formatting rules, are an indicator to
   // us that we should separate the national prefix from the number when formatting.
   private static final Pattern NATIONAL_PREFIX_SEPARATORS_PATTERN = Pattern.compile("[- ]");
@@ -166,9 +168,9 @@ public class AsYouTypeFormatter {
     // First decide whether we should use international or national number rules.
     boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
     List<NumberFormat> formatList =
-        (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
-            ? currentMetadata.intlNumberFormats()
-            : currentMetadata.numberFormats();
+        (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0)
+            ? currentMetadata.getIntlNumberFormatList()
+            : currentMetadata.getNumberFormatList();
     for (NumberFormat format : formatList) {
       // Discard a few formats that we know are not relevant based on the presence of the national
       // prefix.
@@ -203,12 +205,12 @@ public class AsYouTypeFormatter {
     Iterator<NumberFormat> it = possibleFormats.iterator();
     while (it.hasNext()) {
       NumberFormat format = it.next();
-      if (format.leadingDigitsPatternSize() == 0) {
+      if (format.getLeadingDigitsPatternCount() == 0) {
         // Keep everything that isn't restricted by leading digits.
         continue;
       }
       int lastLeadingDigitsPattern =
-          Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
+          Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1);
       Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
           format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
       Matcher m = leadingDigitsPattern.matcher(leadingDigits);
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
index 0cb73fd1..c7bde8e1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -578,8 +578,8 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
         MetadataManager.getAlternateFormatsForCountry(number.getCountryCode());
     String nationalSignificantNumber = util.getNationalSignificantNumber(number);
     if (alternateFormats != null) {
-      for (NumberFormat alternateFormat : alternateFormats.numberFormats()) {
-        if (alternateFormat.leadingDigitsPatternSize() > 0) {
+      for (NumberFormat alternateFormat : alternateFormats.getNumberFormatList()) {
+        if (alternateFormat.getLeadingDigitsPatternCount() > 0) {
           // There is only one leading digits pattern for alternate formats.
           Pattern pattern =
               regexCache.getPatternForRegex(alternateFormat.getLeadingDigitsPattern(0));
@@ -667,7 +667,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
     // Check if a national prefix should be present when formatting this number.
     String nationalNumber = util.getNationalSignificantNumber(number);
     NumberFormat formatRule =
-        util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+        util.chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
     // To do this, we check that a national prefix formatting rule was present and that it wasn't
     // just the first-group symbol ($1) with punctuation.
     if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index a725a033..646b1345 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -303,46 +303,98 @@ public class PhoneNumberUtil {
   // as the default extension prefix. This can be overridden by region-specific preferences.
   private static final String DEFAULT_EXTN_PREFIX = " ext. ";
 
-  // Pattern to capture digits used in an extension. Places a maximum length of "7" for an
-  // extension.
-  private static final String CAPTURING_EXTN_DIGITS = "(" + DIGITS + "{1,7})";
   // Regexp of all possible ways to write extensions, for use when parsing. This will be run as a
   // case-insensitive regexp match. Wide character versions are also provided after each ASCII
   // version.
-  private static final String EXTN_PATTERNS_FOR_PARSING;
-  static final String EXTN_PATTERNS_FOR_MATCHING;
-  static {
-    // One-character symbols that can be used to indicate an extension.
-    String singleExtnSymbolsForMatching = "x\uFF58#\uFF03~\uFF5E";
-    // For parsing, we are slightly more lenient in our interpretation than for matching. Here we
-    // allow "comma" and "semicolon" as possible extension indicators. When matching, these are
-    // hardly ever used to indicate this.
-    String singleExtnSymbolsForParsing = ",;" + singleExtnSymbolsForMatching;
-
-    EXTN_PATTERNS_FOR_PARSING = createExtnPattern(singleExtnSymbolsForParsing);
-    EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(singleExtnSymbolsForMatching);
-  }
-
-  /**
-   * Helper initialiser method to create the regular-expression pattern to match extensions,
-   * allowing the one-char extension symbols provided by {@code singleExtnSymbols}.
-   */
-  private static String createExtnPattern(String singleExtnSymbols) {
-    // There are three regular expressions here. The first covers RFC 3966 format, where the
-    // extension is added using ";ext=". The second more generic one starts with optional white
-    // space and ends with an optional full stop (.), followed by zero or more spaces/tabs/commas
-    // and then the numbers themselves. The other one covers the special case of American numbers
-    // where the extension is written with a hash at the end, such as "- 503#"
-    // Note that the only capturing groups should be around the digits that you want to capture as
-    // part of the extension, or else parsing will fail!
-    // Canonical-equivalence doesn't seem to be an option with Android java, so we allow two options
-    // for representing the accented o - the character itself, and one in the unicode decomposed
-    // form with the combining acute accent.
-    return (RFC3966_EXTN_PREFIX + CAPTURING_EXTN_DIGITS + "|" + "[ \u00A0\\t,]*"
-        + "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|"
-        + "\u0434\u043E\u0431|" + "[" + singleExtnSymbols + "]|int|anexo|\uFF49\uFF4E\uFF54)"
-        + "[:\\.\uFF0E]?[ \u00A0\\t,-]*" + CAPTURING_EXTN_DIGITS + "#?|"
-        + "[- ]+(" + DIGITS + "{1,5})#");
+  private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true);
+  static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false);
+  
+  /** 
+   * Helper method for constructing regular expressions for parsing. Creates an expression that
+   * captures up to maxLength digits.
+   */
+  private static String extnDigits(int maxLength) {
+    return "(" + DIGITS + "{1," + maxLength + "})";
+  }
+
+  /**
+   * Helper initialiser method to create the regular-expression pattern to match extensions.
+   * Note that there are currently six capturing groups for the extension itself. If this number is
+   * changed, MaybeStripExtension needs to be updated.
+   */
+  private static String createExtnPattern(boolean forParsing) {
+    // We cap the maximum length of an extension based on the ambiguity of the way the extension is
+    // prefixed. As per ITU, the officially allowed length for extensions is actually 40, but we
+    // don't support this since we haven't seen real examples and this introduces many false
+    // interpretations as the extension labels are not standardized.
+    int extLimitAfterExplicitLabel = 20;
+    int extLimitAfterLikelyLabel = 15;
+    int extLimitAfterAmbiguousChar = 9;
+    int extLimitWhenNotSure = 6;
+
+    String possibleSeparatorsBetweenNumberAndExtLabel = "[ \u00A0\\t,]*";
+    // Optional full stop (.) or colon, followed by zero or more spaces/tabs/commas.
+    String possibleCharsAfterExtLabel = "[:\\.\uFF0E]?[ \u00A0\\t,-]*";
+    String optionalExtnSuffix = "#?";
+
+    // Here the extension is called out in more explicit way, i.e mentioning it obvious patterns
+    // like "ext.". Canonical-equivalence doesn't seem to be an option with Android java, so we
+    // allow two options for representing the accented o - the character itself, and one in the
+    // unicode decomposed form with the combining acute accent.
+    String explicitExtLabels =
+        "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|\u0434\u043E\u0431|anexo)";
+    // One-character symbols that can be used to indicate an extension, and less commonly used
+    // or more ambiguous extension labels.
+    String ambiguousExtLabels = "(?:[x\uFF58#\uFF03~\uFF5E]|int|\uFF49\uFF4E\uFF54)";
+    // When extension is not separated clearly.
+    String ambiguousSeparator = "[- ]+";
+
+    String rfcExtn = RFC3966_EXTN_PREFIX + extnDigits(extLimitAfterExplicitLabel);
+    String explicitExtn = possibleSeparatorsBetweenNumberAndExtLabel + explicitExtLabels
+        + possibleCharsAfterExtLabel + extnDigits(extLimitAfterExplicitLabel)
+        + optionalExtnSuffix;
+    String ambiguousExtn = possibleSeparatorsBetweenNumberAndExtLabel + ambiguousExtLabels
+        + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar) + optionalExtnSuffix;
+    String americanStyleExtnWithSuffix = ambiguousSeparator + extnDigits(extLimitWhenNotSure) + "#";
+
+    // The first regular expression covers RFC 3966 format, where the extension is added using
+    // ";ext=". The second more generic where extension is mentioned with explicit labels like
+    // "ext:". In both the above cases we allow more numbers in extension than any other extension
+    // labels. The third one captures when single character extension labels or less commonly used
+    // labels are used. In such cases we capture fewer extension digits in order to reduce the
+    // chance of falsely interpreting two numbers beside each other as a number + extension. The
+    // fourth one covers the special case of American numbers where the extension is written with a
+    // hash at the end, such as "- 503#".
+    String extensionPattern =
+        rfcExtn + "|"
+        + explicitExtn + "|"
+        + ambiguousExtn + "|"
+        + americanStyleExtnWithSuffix;
+    // Additional pattern that is supported when parsing extensions, not when matching.
+    if (forParsing) {
+      // This is same as possibleSeparatorsBetweenNumberAndExtLabel, but not matching comma as
+      // extension label may have it.
+      String possibleSeparatorsNumberExtLabelNoComma = "[ \u00A0\\t]*";
+      // ",," is commonly used for auto dialling the extension when connected. First comma is matched
+      // through possibleSeparatorsBetweenNumberAndExtLabel, so we do not repeat it here. Semi-colon
+      // works in Iphone and Android also to pop up a button with the extension number following.
+      String autoDiallingAndExtLabelsFound = "(?:,{2}|;)";
+
+      String autoDiallingExtn = possibleSeparatorsNumberExtLabelNoComma
+          + autoDiallingAndExtLabelsFound + possibleCharsAfterExtLabel
+          + extnDigits(extLimitAfterLikelyLabel) +  optionalExtnSuffix;
+      String onlyCommasExtn = possibleSeparatorsNumberExtLabelNoComma
+        + "(?:,)+" + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar)
+        + optionalExtnSuffix;
+      // Here the first pattern is exclusively for extension autodialling formats which are used
+      // when dialling and in this case we accept longer extensions. However, the second pattern
+      // is more liberal on the number of commas that acts as extension labels, so we have a strict
+      // cap on the number of digits in such extensions.
+      return extensionPattern + "|"
+          + autoDiallingExtn + "|"
+          + onlyCommasExtn;
+    }
+    return extensionPattern;
   }
 
   // Regexp of all known extension prefixes used by different regions followed by 1 or more valid
@@ -1306,7 +1358,7 @@ public class PhoneNumberUtil {
         }
       }
       formattedNumber.append(
-          formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy, numberFormat));
+          formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy.build(), numberFormat));
     }
     maybeAppendFormattedExtension(number, metadata, numberFormat, formattedNumber);
     prefixNumberWithCountryCallingCode(countryCallingCode, numberFormat, formattedNumber);
@@ -1524,14 +1576,15 @@ public class PhoneNumberUtil {
     PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom);
     String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix();
 
-    // For regions that have multiple international prefixes, the international format of the
-    // number is returned, unless there is a preferred international prefix.
+    // In general, if there is a preferred international prefix, use that. Otherwise, for regions
+    // that have multiple international prefixes, the international format of the number is
+    // returned since we would not know which one to use.
     String internationalPrefixForFormatting = "";
-    if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
-      internationalPrefixForFormatting = internationalPrefix;
-    } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
+    if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
       internationalPrefixForFormatting =
           metadataForRegionCallingFrom.getPreferredInternationalPrefix();
+    } else if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
+      internationalPrefixForFormatting = internationalPrefix;
     }
 
     String regionCode = getRegionCodeForCountryCode(countryCallingCode);
@@ -1615,7 +1668,7 @@ public class PhoneNumberUtil {
         PhoneMetadata metadata = getMetadataForRegion(regionCode);
         String nationalNumber = getNationalSignificantNumber(number);
         NumberFormat formatRule =
-            chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+            chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
         // The format rule could still be null here if the national number was 0 and there was no
         // raw input (this should not be possible for numbers generated by the phonenumber library
         // as they would also not have a country calling code and we would have exited earlier).
@@ -1647,7 +1700,7 @@ public class PhoneNumberUtil {
         numFormatCopy.mergeFrom(formatRule);
         numFormatCopy.clearNationalPrefixFormattingRule();
         List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1);
-        numberFormats.add(numFormatCopy);
+        numberFormats.add(numFormatCopy.build());
         formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats);
         break;
     }
@@ -1694,7 +1747,7 @@ public class PhoneNumberUtil {
     }
     String nationalNumber = getNationalSignificantNumber(number);
     NumberFormat formatRule =
-        chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+        chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
     return formatRule != null;
   }
 
@@ -1758,7 +1811,7 @@ public class PhoneNumberUtil {
     } else if (metadataForRegionCallingFrom != null
         && countryCode == getCountryCodeForValidRegion(regionCallingFrom)) {
       NumberFormat formattingPattern =
-          chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(),
+          chooseFormattingPatternForNumber(metadataForRegionCallingFrom.getNumberFormatList(),
                                            nationalNumber);
       if (formattingPattern == null) {
         // If no pattern above is matched, we format the original input.
@@ -1775,7 +1828,7 @@ public class PhoneNumberUtil {
       // This will not work in the cases where the pattern (and not the leading digits) decide
       // whether a national prefix needs to be used, since we have overridden the pattern to match
       // anything, but that is not the case in the metadata to date.
-      return formatNsnUsingPattern(rawInput, newFormat, PhoneNumberFormat.NATIONAL);
+      return formatNsnUsingPattern(rawInput, newFormat.build(), PhoneNumberFormat.NATIONAL);
     }
     String internationalPrefixForFormatting = "";
     // If an unsupported region-calling-from is entered, or a country with multiple international
@@ -1868,13 +1921,13 @@ public class PhoneNumberUtil {
                            PhoneMetadata metadata,
                            PhoneNumberFormat numberFormat,
                            CharSequence carrierCode) {
-    List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats();
+    List<NumberFormat> intlNumberFormats = metadata.getIntlNumberFormatList();
     // When the intlNumberFormats exists, we use that to format national number for the
     // INTERNATIONAL format instead of using the numberDesc.numberFormats.
     List<NumberFormat> availableFormats =
         (intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL)
-        ? metadata.numberFormats()
-        : metadata.intlNumberFormats();
+        ? metadata.getNumberFormatList()
+        : metadata.getIntlNumberFormatList();
     NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number);
     return (formattingPattern == null)
         ? number
@@ -1884,7 +1937,7 @@ public class PhoneNumberUtil {
   NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
                                                 String nationalNumber) {
     for (NumberFormat numFormat : availableFormats) {
-      int size = numFormat.leadingDigitsPatternSize();
+      int size = numFormat.getLeadingDigitsPatternCount();
       if (size == 0 || regexCache.getPatternForRegex(
               // We always use the last leading_digits_pattern, as it is the most detailed.
               numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
@@ -2536,7 +2589,7 @@ public class PhoneNumberUtil {
           // Note that when adding the possible lengths from mobile, we have to again check they
           // aren't empty since if they are this indicates they are the same as the general desc and
           // should be obtained from there.
-          possibleLengths.addAll(mobileDesc.getPossibleLengthList().size() == 0
+          possibleLengths.addAll(mobileDesc.getPossibleLengthCount() == 0
               ? metadata.getGeneralDesc().getPossibleLengthList()
               : mobileDesc.getPossibleLengthList());
           // The current list is sorted; we need to merge in the new list and re-sort (duplicates
@@ -3518,6 +3571,6 @@ public class PhoneNumberUtil {
       logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode);
       return false;
     }
-    return metadata.isMobileNumberPortableRegion();
+    return metadata.getMobileNumberPortableRegion();
   }
 }
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
index e2ef1227..8517c795 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
@@ -102,7 +102,9 @@ public final class Phonemetadata {
     public java.util.List<String> leadingDigitPatterns() {
       return leadingDigitsPattern_;
     }
-    public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); }
+    @Deprecated
+    public int leadingDigitsPatternSize() { return getLeadingDigitsPatternCount(); }
+    public int getLeadingDigitsPatternCount() { return leadingDigitsPattern_.size(); }
     public String getLeadingDigitsPattern(int index) {
       return leadingDigitsPattern_.get(index);
     }
@@ -361,6 +363,16 @@ public final class Phonemetadata {
       public PhoneMetadata build() {
         return this;
       }
+
+      public Builder setId(String value) {
+        super.setId(value);
+        return this;
+      }
+
+      public Builder setInternationalPrefix(String value) {
+        super.setInternationalPrefix(value);
+        return this;
+      }
     }
     public static Builder newBuilder() {
       return new Builder();
@@ -371,6 +383,12 @@ public final class Phonemetadata {
     private PhoneNumberDesc generalDesc_ = null;
     public boolean hasGeneralDesc() { return hasGeneralDesc; }
     public PhoneNumberDesc getGeneralDesc() { return generalDesc_; }
+    public PhoneNumberDesc getGeneralDescBuilder() {
+      if (generalDesc_ == null) {
+        generalDesc_ = new PhoneNumberDesc();
+      }
+      return generalDesc_ ;
+    }
     public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) {
       if (value == null) {
         throw new NullPointerException();
@@ -730,10 +748,16 @@ public final class Phonemetadata {
 
     // repeated NumberFormat number_format = 19;
     private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>();
+    @Deprecated
     public java.util.List<NumberFormat> numberFormats() {
+      return getNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getNumberFormatList() {
       return numberFormat_;
     }
-    public int numberFormatSize() { return numberFormat_.size(); }
+    @Deprecated
+    public int numberFormatSize() { return getNumberFormatCount(); }
+    public int getNumberFormatCount() { return numberFormat_.size(); }
     public NumberFormat getNumberFormat(int index) {
       return numberFormat_.get(index);
     }
@@ -748,10 +772,16 @@ public final class Phonemetadata {
     // repeated NumberFormat intl_number_format = 20;
     private java.util.List<NumberFormat> intlNumberFormat_ =
         new java.util.ArrayList<NumberFormat>();
+    @Deprecated
     public java.util.List<NumberFormat> intlNumberFormats() {
+      return getIntlNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getIntlNumberFormatList() {
       return intlNumberFormat_;
     }
-    public int intlNumberFormatSize() { return intlNumberFormat_.size(); }
+    @Deprecated
+    public int intlNumberFormatSize() { return getIntlNumberFormatCount(); }
+    public int getIntlNumberFormatCount() { return intlNumberFormat_.size(); }
     public NumberFormat getIntlNumberFormat(int index) {
       return intlNumberFormat_.get(index);
     }
@@ -818,7 +848,9 @@ public final class Phonemetadata {
     private boolean hasMobileNumberPortableRegion;
     private boolean mobileNumberPortableRegion_ = false;
     public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; }
-    public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
+    @Deprecated
+    public boolean isMobileNumberPortableRegion() { return getMobileNumberPortableRegion(); }
+    public boolean getMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
     public PhoneMetadata setMobileNumberPortableRegion(boolean value) {
       hasMobileNumberPortableRegion = true;
       mobileNumberPortableRegion_ = value;
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
index 91aa8709..4b5e8b07 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
@@ -26,9 +26,9 @@ import java.util.Set;
 public class ShortNumbersRegionCodeSet {
   // A set of all region codes for which data is available.
   static Set<String> getRegionCodeSet() {
-    // The capacity is set to 320 as there are 240 different entries,
+    // The capacity is set to 321 as there are 241 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<String> regionCodeSet = new HashSet<String>(320);
+    Set<String> regionCodeSet = new HashSet<String>(321);
 
     regionCodeSet.add("AC");
     regionCodeSet.add("AD");
@@ -231,6 +231,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("SN");
     regionCodeSet.add("SO");
     regionCodeSet.add("SR");
+    regionCodeSet.add("SS");
     regionCodeSet.add("ST");
     regionCodeSet.add("SV");
     regionCodeSet.add("SX");
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
index 5e102704..015808af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
index d03d525b..4d46fcfb 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
index 1e50e33e..8f8615dd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
index ac762db9..6806a009 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
index ef8f6b9d..0500b27a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
index fe18ba0e..8fac331c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
index 89d4f920..c26e30d3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
index 2c8b5d51..62b75020 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
index 590270ab..6813bd51 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
index 24f6ff3e..a84d8785 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index f70855f1..66dd630c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index 59ef115b..17508f94 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index 11ed1358..dfe50786 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index fa9d67fb..6ba5be41 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index 46f7d482..3af1e388 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index 77742834..cb06fb83 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index 518d27a1..41c00923 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 0bfb1c81..29424fbe 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index 1edc8ec4..a54f4ca3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 0e277525..8367ee94 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index 8a07a997..9da6fb14 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 90111031..6cb25d70 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index cdfe19ba..401dafe0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index af69fa2d..339334bf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index a7456163..71e260e1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index 0ebc3f86..01bb8dac 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 99930e05..dc01444b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index ae149ccd..37bcc552 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 2fc3fcb7..3214db5b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index cb1ca409..8fa119b2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index ea1d50ea..bb43464a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 975e2430..8dc7785d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index 263dda59..efa9b058 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index c5c88df0..06ea5190 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
index 3a02a3db..8c396100 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index 871bc2a4..ed648e4b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index 82c1b462..6ccdd69a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index f6de5b1f..e1cab68c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index ed1330d6..21bc8097 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 9129855c..5e981c85 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index 702957a8..b29ac005 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index 66c94bfe..7f8a039b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index afdb010e..8236543d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index 2260b6a6..e7e30ac1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index f37beafa..8d341fb6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index ba1b00f8..d98c24a6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index 01977cc1..ddebc8f7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index f07ac532..283e679d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index a34eebe8..3f7fcbbc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index 5ae18de6..492f70af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 784fbc38..602a7124 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index c5e3a73a..fcd3965c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index c7a35b3d..c06344a6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index 201c513b..bfa1f137 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index e7ac5d99..3a938dfe 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index 750a8189..ebb5fb49 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index e3e520f0..dc4b525c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 64ecb2d6..2b89782e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 2de0b7dc..5a7271eb 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index bf25f427..051f5032 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index adcbef31..6128ffe2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 75c7e4ed..cdfd1f86 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 05362f0d..b8763e6a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index c50382b1..43163312 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index cf08564c..02871045 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index 555cd7f7..33d742f9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 4f1787a0..5a377cf9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index c4a58d57..4520dc95 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index 818108b5..c7ee185a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index fd88ec85..d52abcfc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index f75507be..4f5eea54 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index 75ebe2ae..b11e9fda 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index 95116db1..e11e957c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 46262b95..009e48ab 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index cc84dd5c..8a056eb2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index df48e2e2..e1da75ca 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index e35c8669..296fcf9d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index 41b16c84..b86a9ebb 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index 830e1906..9fdea277 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index 647c0f5e..523e2b95 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index 2a1014fd..eb13b979 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index 1c997465..d0da8506 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index bcfab3b1..3259f87a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index d08ab51b..c3e4ea97 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index 1f8a02eb..f6a759c8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index 8f9af666..fa3499ac 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 5424db93..7d938623 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 3d3105e2..00752953 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index b1b53ac3..11de05ac 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 150cedd4..93dc67aa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 8bbe40c5..6ce88ce9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 7715a991..28a2ba41 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index f543a577..993af32f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 0fd10f3e..50b27e6b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 1322f537..9489e89a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 8263606f..8a720626 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index 74276025..c75dce67 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index c675b33e..0cea04e8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index 0c26eba0..bd6d7e51 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index 62d29a61..fa01bc2c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 5c8fcbdb..3588cb14 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index cccb1135..97585357 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index 3924858d..ec6030f6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 56af97a8..7672fa34 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 7f84e6a1..1042b05f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index 329ba106..dc8fdc2e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index 766d17fe..0c9dd320 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 8474b60f..9c1a73fb 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index bdcc2ce5..54c5bec9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index 9dbb9098..a86322af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index 6905f1c7..4ba22785 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index 138f831c..bc037fa0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index f8d42e1b..33f69238 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 78958eea..99dbcc09 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index 27ef5699..85135ca2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 37f28c5f..76b8bc9f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index f2a49339..265c4001 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 0469e249..4574615b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index 3f80cf8d..2a00a071 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 61bf8c59..94c3debf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 8ddfa2c2..0849ea33 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 283a8f1f..47c2eec0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 5bef260d..9a57e591 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index ca211896..9aec8765 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index e4c2c8e1..a4d20b89 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 28b30d39..8df82b0e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index ab0eb3eb..89b4bcc3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index f24e3ce6..213fd6e6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index c0b73d1b..7efdbaee 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index 03c5ef36..dbd636e5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index b3159b57..5ab6a0d6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 10ea2dac..842413ab 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index 628b3e6e..41b92f5b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index bba1e5b8..f8b5f35c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 21820fa1..51ff6a48 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index 0e2f088c..cde7ce65 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index 3e8227de..669f02a5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 5daadbf8..365bafd7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index f0370fdc..594de97c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index 3a4940d5..a885cb56 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index afd1bb6d..4622c358 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 28d2155d..7188cf21 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index 5c6c8db7..bc9cbd83 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index 0e50b28a..7c92f624 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index 13c181b8..32c86450 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 9d8fb703..12173c6b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 4d253b1c..6e068111 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 104b4897..36dc1e39 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index 91b1c265..996df6d1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 99e0866f..49e38ad9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index 26b59f40..eb715841 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index e51eab37..6ec881ff 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 3060a189..45b707a5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index 0e274840..7eae3103 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index 18719fc8..81dd47e2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index c60a796f..9d5a91b7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index 3cc8906f..7881bc52 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index 567bc896..56449a39 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index 56f4ca50..305b85e9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index e3b9d7ac..67735fad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index b5bf1341..aa7672ef 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 8dc8e7f1..15e4a2a7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index d9615cdc..78bb1e13 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 3f4c84e9..981177cd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 81f1f6ba..857b6d9b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index aa0ec2ba..dddb34ea 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index cdd4e2c5..bececb62 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index 7c60466a..5e3bcf81 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index 5a5d1bee..c8b36297 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index 60fe5d9e..caeb2ec4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index c866916f..15c760fd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index dd71bafa..7b882a2f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index 085354c8..fb9422cc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index 2d4aa179..d3d777cf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 6d881b4b..0e2e60c2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index a9a460f8..2b1ed7fc 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 4763de63..0688624f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index 1f0b7257..77b405f4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index 315a4441..def0b3e5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index b1fd0787..3e56482a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index 814458c2..cc506d61 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
index f4a21ec4..c2bb116e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index 804576e8..06dcf45d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index 41aadc81..b0fd135b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index ee304f1d..1f1ce10f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index c76cd56f..23c56495 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index ae8a5d54..c11bfe39 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index 4d8a8c4d..9133378e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 58c49b49..4b6aa0b7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index f80317e3..13d96260 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index 0d19153c..46181d0a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index aa999aa2..93be3b41 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 5cb4c709..0a6dc03c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index 545acd6c..ddbeb93b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index 099abadd..80164d3f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index 9ddaa6d0..cac43d94 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 77b1c37e..19a6bcce 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index 1b38fad9..d08e73c7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 4fd5bef1..f8859190 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index 7af1941b..ac1bd52b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index dd28438a..b33e278c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index f6a9ca7c..2542dace 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 63c6552c..7cfd32e7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 26a0a833..2e7992dd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 7def0b04..057bc582 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index b0a9091b..b340ff45 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index 37a25cdc..0a8fd5af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index 2f76125e..4512db73 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index ed5f1c22..70902367 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index 120733ed..a4fdd21e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
index ec0dc882..dc8edc13 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index 11964154..e64d262d 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index b1d2c0be..cec9da09 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index 12ff2b2e..ab361706 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index c2db1226..9cad69b6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 6dab4fda..7b82adf7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
index 7ab70d5d..2fbdcd86 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
index 4e0a8f00..64f218f0 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
index feefd0bf..b940c977 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
index d7944585..1813fab9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
index 583c0c53..ab062589 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
index 7b613184..00428671 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
index ae066ec5..46bf730e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
index 839a4a68..31f262db 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
index 9a777b7d..bfb86341 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
index ff54ca3c..13b2e9ef 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
index 14d3b763..abfff579 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
index 51e48ad1..3695f2c5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
index f674cb16..83cf4915 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
index fb4de36d..5e165911 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
index fdb71237..9bb22e08 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
index 78f089fe..c901e022 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
index 13fe8a60..e9614518 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
index 2a56c461..5b88b7a5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
index 4ca8ec77..f9d3bca2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
index ab4b2adc..1aa16bb6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
index 8053fb9d..2041eca9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
index f1502523..ec2c9fd2 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
index 98b57910..850ba175 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
index deaa0e81..ea33a674 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
index daf2bcd5..08e25202 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
index 97a01cc9..fd3e40fe 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
index 58d71349..4683a448 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
index 7039793d..aebc1cf5 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
index 6a92ffa6..bc6a0ccf 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
index c6aea9b1..86b5c43e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
index 49a20b39..03cf2c35 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
index dbd573a1..50e29a47 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
index 510227c5..ee529825 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
index c4fc13a1..7f353725 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
index c5b01cd7..6c8e21e8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
index 05486d0b..531a36af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
index 2f817568..392bc44a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
index 84888cde..bd7b5163 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
index 776bb83b..8c900031 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
index 3ded7e00..364316d6 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
index 8b2fc41a..0a823446 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
index 5b95e0af..0c3664fa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
index 0ccb213a..90f87cd4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
index 0458496e..f288a7ce 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
index aca98576..9d77fc15 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
index 15ffc494..5de895ff 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
index 6a92ce3e..3b460298 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
index d6477602..6a3ac5b1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
index bf7eb3ff..77d9e3ec 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
index 0ddedf6e..eb3734c9 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
index a71337b6..53ab50c4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
index 4860822a..c888bcb1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
index d6b1c18c..106b9fc1 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
index d50a5a0b..ce332e75 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
index 0ba762ba..9b5aabdd 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
index 07f849f8..480c607b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
index 1d904c20..9e0046f7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
index 001199f9..ebaac114 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
index e1a6e8f8..191f503f 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
index 42355f3f..05e8cf7a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
index 174c0e95..0217bfd7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
new file mode 100644
index 00000000..a2d700a3
--- /dev/null
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
index ca67d4fe..ea017d00 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
index ee931b6b..8a301f43 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
index 174a66c8..0e4b300a 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
index 8e22d994..fd3a1fd7 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
index 7c246698..f3c193ba 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
index f5189985..ee5e4fde 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
index d3afe7e2..7f3a75af 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
index 0dc8de2f..91563bad 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
index bb0cb822..b977ac2b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
index 28c638a8..c0b38677 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
index 18bbe336..6b22eade 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
index dc912d71..a91f9253 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
index cdfdd926..b8e1de87 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
index ab79ab83..011b07b8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 09a8a40b..0bdd8b67 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -638,6 +638,20 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase {
     assertEquals("+52 800 123 45", formatter.inputDigit('5'));
     assertEquals("+52 800 123 456", formatter.inputDigit('6'));
     assertEquals("+52 800 123 4567", formatter.inputDigit('7'));
+    
+    // +529011234567, proactively ensuring that no formatting is applied, where a format is chosen
+    // that would otherwise have led to some digits being dropped.
+    formatter.clear();
+    assertEquals("9", formatter.inputDigit('9'));
+    assertEquals("90", formatter.inputDigit('0'));
+    assertEquals("901", formatter.inputDigit('1'));
+    assertEquals("9011", formatter.inputDigit('1'));
+    assertEquals("90112", formatter.inputDigit('2'));
+    assertEquals("901123", formatter.inputDigit('3'));
+    assertEquals("9011234", formatter.inputDigit('4'));
+    assertEquals("90112345", formatter.inputDigit('5'));
+    assertEquals("901123456", formatter.inputDigit('6'));
+    assertEquals("9011234567", formatter.inputDigit('7'));
 
     // +52 55 1234 5678
     formatter.clear();
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
index f4905532..91b2f395 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
@@ -28,7 +28,7 @@ public class MetadataManagerTest extends TestCase {
     // We should have some data for Germany.
     PhoneMetadata germanyMetadata = MetadataManager.getAlternateFormatsForCountry(49);
     assertNotNull(germanyMetadata);
-    assertTrue(germanyMetadata.numberFormats().size() > 0);
+    assertTrue(germanyMetadata.getNumberFormatCount() > 0);
   }
 
   public void testAlternateFormatsFailsGracefully() throws Exception {
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index 1b26a10d..641bd77d 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -189,7 +189,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     assertEquals(1, metadata.getCountryCode());
     assertEquals("011", metadata.getInternationalPrefix());
     assertTrue(metadata.hasNationalPrefix());
-    assertEquals(2, metadata.numberFormatSize());
+    assertEquals(2, metadata.getNumberFormatCount());
     assertEquals("(\\d{3})(\\d{3})(\\d{4})",
                  metadata.getNumberFormat(1).getPattern());
     assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat());
@@ -213,8 +213,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     assertEquals(49, metadata.getCountryCode());
     assertEquals("00", metadata.getInternationalPrefix());
     assertEquals("0", metadata.getNationalPrefix());
-    assertEquals(6, metadata.numberFormatSize());
-    assertEquals(1, metadata.getNumberFormat(5).leadingDigitsPatternSize());
+    assertEquals(6, metadata.getNumberFormatCount());
+    assertEquals(1, metadata.getNumberFormat(5).getLeadingDigitsPatternCount());
     assertEquals("900", metadata.getNumberFormat(5).getLeadingDigitsPattern(0));
     assertEquals("(\\d{3})(\\d{3,4})(\\d{4})",
                  metadata.getNumberFormat(5).getPattern());
@@ -653,6 +653,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     // are accepted as possible international prefixes in our test metadta.)
     assertEquals("0011 39 02 3661 8300",
                  phoneUtil.formatOutOfCountryCallingNumber(IT_NUMBER, RegionCode.AU));
+
+    // Testing preferred international prefixes with ~ are supported (designates waiting).
+    assertEquals("8~10 39 02 3661 8300",
+                 phoneUtil.formatOutOfCountryCallingNumber(IT_NUMBER, RegionCode.UZ));
   }
 
   public void testFormatOutOfCountryKeepingAlphaChars() {
@@ -900,11 +904,11 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
   }
 
   public void testFormatByPattern() {
-    NumberFormat newNumFormat = new NumberFormat();
+    NumberFormat.Builder newNumFormat = NumberFormat.newBuilder();
     newNumFormat.setPattern("(\\d{3})(\\d{3})(\\d{4})");
     newNumFormat.setFormat("($1) $2-$3");
     List<NumberFormat> newNumberFormats = new ArrayList<NumberFormat>();
-    newNumberFormats.add(newNumFormat);
+    newNumberFormats.add(newNumFormat.build());
 
     assertEquals("(650) 253-0000", phoneUtil.formatByPattern(US_NUMBER, PhoneNumberFormat.NATIONAL,
                                                              newNumberFormats));
@@ -919,6 +923,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     // followed.
     newNumFormat.setNationalPrefixFormattingRule("$NP ($FG)");
     newNumFormat.setFormat("$1 $2-$3");
+    newNumberFormats.set(0, newNumFormat.build());
     assertEquals("1 (242) 365-1234",
                  phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.NATIONAL,
                                            newNumberFormats));
@@ -928,7 +933,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
 
     newNumFormat.setPattern("(\\d{2})(\\d{5})(\\d{3})");
     newNumFormat.setFormat("$1-$2 $3");
-    newNumberFormats.set(0, newNumFormat);
+    newNumberFormats.set(0, newNumFormat.build());
 
     assertEquals("02-36618 300",
                  phoneUtil.formatByPattern(IT_NUMBER, PhoneNumberFormat.NATIONAL,
@@ -940,17 +945,19 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     newNumFormat.setNationalPrefixFormattingRule("$NP$FG");
     newNumFormat.setPattern("(\\d{2})(\\d{4})(\\d{4})");
     newNumFormat.setFormat("$1 $2 $3");
-    newNumberFormats.set(0, newNumFormat);
+    newNumberFormats.set(0, newNumFormat.build());
     assertEquals("020 7031 3000",
                  phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
                                            newNumberFormats));
 
     newNumFormat.setNationalPrefixFormattingRule("($NP$FG)");
+    newNumberFormats.set(0, newNumFormat.build());
     assertEquals("(020) 7031 3000",
                  phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
                                            newNumberFormats));
 
     newNumFormat.setNationalPrefixFormattingRule("");
+    newNumberFormats.set(0, newNumFormat.build());
     assertEquals("20 7031 3000",
                  phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL,
                                            newNumberFormats));
@@ -1814,29 +1821,32 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
   }
 
   public void testMaybeStripNationalPrefix() {
-    PhoneMetadata metadata = new PhoneMetadata();
+    PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder();
+    metadata.setId("ignored");
     metadata.setNationalPrefixForParsing("34");
-    metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}"));
+    metadata
+        .getGeneralDescBuilder()
+        .setNationalNumberPattern("\\d{4,8}");
     StringBuilder numberToStrip = new StringBuilder("34356778");
     String strippedNumber = "356778";
-    assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
+    assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
     assertEquals("Should have had national prefix stripped.",
                  strippedNumber, numberToStrip.toString());
     // Retry stripping - now the number should not start with the national prefix, so no more
     // stripping should occur.
-    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
+    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
     assertEquals("Should have had no change - no national prefix present.",
                  strippedNumber, numberToStrip.toString());
     // Some countries have no national prefix. Repeat test with none specified.
     metadata.setNationalPrefixForParsing("");
-    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
+    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
     assertEquals("Should not strip anything with empty national prefix.",
                  strippedNumber, numberToStrip.toString());
     // If the resultant number doesn't match the national rule, it shouldn't be stripped.
     metadata.setNationalPrefixForParsing("3");
     numberToStrip = new StringBuilder("3123");
     strippedNumber = "3123";
-    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
+    assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
     assertEquals("Should have had no change - after stripping, it wouldn't have matched "
         + "the national rule.",
         strippedNumber, numberToStrip.toString());
@@ -1845,8 +1855,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     numberToStrip = new StringBuilder("08122123456");
     strippedNumber = "22123456";
     StringBuilder carrierCode = new StringBuilder();
-    assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(
-        numberToStrip, metadata, carrierCode));
+    assertTrue(
+        phoneUtil.maybeStripNationalPrefixAndCarrierCode(
+            numberToStrip, metadata.build(), carrierCode));
     assertEquals("81", carrierCode.toString());
     assertEquals("Should have had national prefix and carrier code stripped.",
                  strippedNumber, numberToStrip.toString());
@@ -1856,7 +1867,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     metadata.setNationalPrefixForParsing("0(\\d{2})");
     numberToStrip = new StringBuilder("031123");
     String transformedNumber = "5315123";
-    assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null));
+    assertTrue(
+        phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata.build(), null));
     assertEquals("Should transform the 031 to a 5315.",
                  transformedNumber, numberToStrip.toString());
   }
@@ -2669,6 +2681,137 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     // Retry with the same number in a slightly different format.
     assertEquals(usWithExtension, phoneUtil.parse("+1 (645) 123 1234 ext. 910#", RegionCode.US));
   }
+  
+  public void testParseHandlesLongExtensionsWithExplicitLabels() throws Exception {
+    // Test lower and upper limits of extension lengths for each type of label.
+    PhoneNumber nzNumber = new PhoneNumber();
+    nzNumber.setCountryCode(64).setNationalNumber(33316005L);
+
+    // Firstly, when in RFC format: PhoneNumberUtil.extLimitAfterExplicitLabel
+    nzNumber.setExtension("0");
+    assertEquals(nzNumber, phoneUtil.parse("tel:+6433316005;ext=0", RegionCode.NZ));
+    nzNumber.setExtension("01234567890123456789");
+    assertEquals(
+        nzNumber, phoneUtil.parse("tel:+6433316005;ext=01234567890123456789", RegionCode.NZ));
+    // Extension too long.
+    try {
+      phoneUtil.parse("tel:+6433316005;ext=012345678901234567890", RegionCode.NZ);
+      fail(
+          "This should not parse as length of extension is higher than allowed: "
+              + "tel:+6433316005;ext=012345678901234567890");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals(
+          "Wrong error type stored in exception.",
+          NumberParseException.ErrorType.NOT_A_NUMBER,
+          e.getErrorType());
+    }
+
+    // Explicit extension label: PhoneNumberUtil.extLimitAfterExplicitLabel
+    nzNumber.setExtension("1");
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005ext:1", RegionCode.NZ));
+    nzNumber.setExtension("12345678901234567890");
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 xtn:12345678901234567890", RegionCode.NZ));
+    assertEquals(
+        nzNumber, phoneUtil.parse("03 3316005 extension\t12345678901234567890", RegionCode.NZ));
+    assertEquals(
+        nzNumber, phoneUtil.parse("03 3316005 xtensio:12345678901234567890", RegionCode.NZ));
+    assertEquals(
+        nzNumber, phoneUtil.parse("03 3316005 xtensi\u00F3n, 12345678901234567890#", RegionCode.NZ));
+    assertEquals(
+        nzNumber, phoneUtil.parse("03 3316005extension.12345678901234567890", RegionCode.NZ));
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 \u0434\u043E\u0431:12345678901234567890", RegionCode.NZ));
+    // Extension too long.
+    try {
+      phoneUtil.parse("03 3316005 extension 123456789012345678901", RegionCode.NZ);
+      fail(
+          "This should not parse as length of extension is higher than allowed: "
+              + "03 3316005 extension 123456789012345678901");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals(
+          "Wrong error type stored in exception.",
+          NumberParseException.ErrorType.TOO_LONG,
+          e.getErrorType());
+    }
+  }
+
+  public void testParseHandlesLongExtensionsWithAutoDiallingLabels() throws Exception {
+    // Secondly, cases of auto-dialling and other standard extension labels,
+    // PhoneNumberUtil.extLimitAfterLikelyLabel
+    PhoneNumber usNumberUserInput = new PhoneNumber();
+    usNumberUserInput.setCountryCode(1).setNationalNumber(2679000000L);
+    usNumberUserInput.setExtension("123456789012345");
+    assertEquals(
+        usNumberUserInput, phoneUtil.parse("+12679000000,,123456789012345#", RegionCode.US));
+    assertEquals(
+        usNumberUserInput, phoneUtil.parse("+12679000000;123456789012345#", RegionCode.US));
+    PhoneNumber ukNumberUserInput = new PhoneNumber();
+    ukNumberUserInput.setCountryCode(44).setNationalNumber(2034000000L).setExtension("123456789");
+    assertEquals(ukNumberUserInput, phoneUtil.parse("+442034000000,,123456789#", RegionCode.GB));
+    // Extension too long.
+    try {
+      phoneUtil.parse("+12679000000,,1234567890123456#", RegionCode.US);
+      fail(
+          "This should not parse as length of extension is higher than allowed: "
+              + "+12679000000,,1234567890123456#");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals(
+          "Wrong error type stored in exception.",
+          NumberParseException.ErrorType.NOT_A_NUMBER,
+          e.getErrorType());
+    }
+  }
+
+  public void testParseHandlesShortExtensionsWithAmbiguousChar() throws Exception {
+    PhoneNumber nzNumber = new PhoneNumber();
+    nzNumber.setCountryCode(64).setNationalNumber(33316005L);
+
+    // Thirdly, for single and non-standard cases:
+    // PhoneNumberUtil.extLimitAfterAmbiguousChar
+    nzNumber.setExtension("123456789");
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 x 123456789", RegionCode.NZ));
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 x. 123456789", RegionCode.NZ));
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 #123456789#", RegionCode.NZ));
+    assertEquals(nzNumber, phoneUtil.parse("03 3316005 ~ 123456789", RegionCode.NZ));
+    // Extension too long.
+    try {
+      phoneUtil.parse("03 3316005 ~ 1234567890", RegionCode.NZ);
+      fail(
+          "This should not parse as length of extension is higher than allowed: "
+              + "03 3316005 ~ 1234567890");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals(
+          "Wrong error type stored in exception.",
+          NumberParseException.ErrorType.TOO_LONG,
+          e.getErrorType());
+    }
+  }
+
+  public void testParseHandlesShortExtensionsWhenNotSureOfLabel() throws Exception {
+    // Lastly, when no explicit extension label present, but denoted by tailing #:
+    // PhoneNumberUtil.extLimitWhenNotSure
+    PhoneNumber usNumber = new PhoneNumber();
+    usNumber.setCountryCode(1).setNationalNumber(1234567890L).setExtension("666666");
+    assertEquals(usNumber, phoneUtil.parse("+1123-456-7890 666666#", RegionCode.US));
+    usNumber.setExtension("6");
+    assertEquals(usNumber, phoneUtil.parse("+11234567890-6#", RegionCode.US));
+    // Extension too long.
+    try {
+      phoneUtil.parse("+1123-456-7890 7777777#", RegionCode.US);
+      fail(
+          "This should not parse as length of extension is higher than allowed: "
+              + "+1123-456-7890 7777777#");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals(
+          "Wrong error type stored in exception.",
+          NumberParseException.ErrorType.NOT_A_NUMBER,
+          e.getErrorType());
+    }
+  }
 
   public void testParseAndKeepRaw() throws Exception {
     PhoneNumber alphaNumericNumber = new PhoneNumber().mergeFrom(ALPHA_NUMERIC_NUMBER).
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
index 74f5f2a9..fa8d8c4f 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
index 822f40dc..0470eb80 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/internal/MatcherTest.java
@@ -29,9 +29,7 @@ public class MatcherTest extends TestCase {
   }
 
   private void checkMatcherBehavesAsExpected(MatcherApi matcher) {
-    PhoneNumberDesc desc = new PhoneNumberDesc();
-
-    desc = createDesc("");
+    PhoneNumberDesc desc = createDesc("");
     // Test if there is no matcher data.
     assertInvalid(matcher, "1", desc);
 
@@ -60,11 +58,11 @@ public class MatcherTest extends TestCase {
   // Helper method to set national number fields in the PhoneNumberDesc proto. Empty fields won't be
   // set.
   private PhoneNumberDesc createDesc(String nationalNumberPattern) {
-    PhoneNumberDesc desc = new PhoneNumberDesc();
+    PhoneNumberDesc.Builder desc = PhoneNumberDesc.newBuilder();
     if (nationalNumberPattern.length() > 0) {
       desc.setNationalNumberPattern(nationalNumberPattern);
     }
-    return desc;
+    return desc.build();
   }
 
   private void assertMatched(MatcherApi matcher, String number, PhoneNumberDesc desc) {
diff --git a/pom.xml b/pom.xml
index d5f4fe07..97b8cc5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>8.10.21</version>
+  <version>8.12.46</version>
   <packaging>pom</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
@@ -34,7 +34,7 @@
     <connection>scm:git:https://github.com/google/libphonenumber.git</connection>
     <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection>
     <url>https://github.com/google/libphonenumber/</url>
-    <tag>v8.10.21</tag>
+    <tag>v8.12.46</tag>
   </scm>
 
   <properties>
@@ -161,8 +161,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-	  <target>1.6</target>
+          <source>1.7</source>
+	  <target>1.7</target>
 	  <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -232,7 +232,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
index e3f0c0b8..f029b461 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1242_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en
new file mode 100644
index 00000000..a9ac6ec4
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1326_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en
new file mode 100644
index 00000000..04c93975
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1340_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
index cc5f70e4..bd11fc2e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1345_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en
new file mode 100644
index 00000000..7c1b37ea
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1367_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en
new file mode 100644
index 00000000..7107ecea
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1368_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en
deleted file mode 100644
index 024ff727..00000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1441_en
+++ /dev/null
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en
new file mode 100644
index 00000000..6924decd
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1447_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en
new file mode 100644
index 00000000..352dd5eb
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1448_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en
new file mode 100644
index 00000000..435c6f78
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1464_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en
new file mode 100644
index 00000000..6f081063
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1474_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en
new file mode 100644
index 00000000..0f8e15b8
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1572_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en
new file mode 100644
index 00000000..7d5f7c56
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1582_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en
new file mode 100644
index 00000000..0c78c721
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1659_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en
new file mode 100644
index 00000000..6d2e0605
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1672_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en
new file mode 100644
index 00000000..8cc22d56
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1771_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en
new file mode 100644
index 00000000..32e5f3e2
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1839_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en
new file mode 100644
index 00000000..a9faf2a6
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1840_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
index 4440fe70..42c43eb8 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1854_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
index 05fbabf3..d5c0c4ae 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1867_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en
new file mode 100644
index 00000000..523a8aaf
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1945_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
index b89c9e09..2ae8176b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
index f6b11763..9016b0d0 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
index 7a1379ca..9bdb5872 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/213_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
index 9af2d13e..10e20d19 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/216_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
index 8c815423..b6ec6906 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/218_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
index 6ef28be7..81be19a1 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/220_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
index 87a8cc14..1936bb2d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/221_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
index 94734b8b..c0340bfb 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/224_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
index 747091b2..47e1916f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/225_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
index 416e875f..5bafef13 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/233_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
index da1af172..ef8dd438 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/234_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en
new file mode 100644
index 00000000..314832a8
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/236_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
index 092d85a4..6367de86 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/238_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
index 08484279..64095f9a 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/241_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
index 007eb7c9..f2b6c5ad 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
index 7b2d9fc2..7b8224fd 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/252_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
index 80432934..9826d454 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/264_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
index 0a066119..066ad251 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/267_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
index 6aea6389..21fffa1a 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
index 1f877a67..06afe7fe 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/290_fr
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
index e7f6f165..c94e1399 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
index e6424bbf..eb983e1c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
index 77a25fc4..4e81c8af 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
index 652bfda2..3ab2985b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
index 4c80c16c..e0bdb810 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_de
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
index ad888cc7..26e14b49 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/352_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
index b207f523..d9fdcd03 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/353_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
index 2e85aa2a..15b7906f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/354_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
index f2fffb5a..b49d48c9 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/370_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
index eeee7e45..658550cd 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
index 1d11627d..d2333d4f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_hy
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
index 9f0226f1..7d523180 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/374_ru
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
index 4626068f..32b5f398 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/380_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en
new file mode 100644
index 00000000..115cf8f0
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/386_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
index e3b6913d..2d834341 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/389_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
index 5a5dc092..e513c686 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/421_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
index 40fd28d1..14c8da37 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/43_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
index 3e19613f..b40793e7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
index 0e30c333..35bada2d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv
deleted file mode 100644
index 31a27a8d..00000000
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/46_sv
+++ /dev/null
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
index 91d9f47e..828e127d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/47_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
index 428b8bf3..ae26ed34 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_de
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
index 11f59e47..0c7aaaed 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/49_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
index d8eabc44..d9487c95 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
index c8e25d49..e51cd55d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
index 7f5de7c7..7fc1659b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_es
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
index 77d1fee9..53245827 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
index 3955d713..ce165988 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/55_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
index a6724ae3..f0e057e3 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
index b453a4e5..45107eed 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/56_es
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
index 347d96b7..ec254fad 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
index 2bf005e9..54ba222e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
index 5e85d0c8..4def98a7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/58_es
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en
new file mode 100644
index 00000000..551bd93b
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/593_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en
new file mode 100644
index 00000000..e6307d46
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/595_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en
new file mode 100644
index 00000000..3d486dbb
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/598_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
index 54bef5f3..4db9fde7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/599_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
index 1e213743..3b71403f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/60_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
index 123a41c4..e56bfb93 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en
new file mode 100644
index 00000000..a7d08a1d
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/63_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
index 8e564259..835a1aad 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/64_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
index cb2807d7..4a5546c7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
index 5e86e0b5..d68b6237 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/66_th
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en
new file mode 100644
index 00000000..2483baa2
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/670_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en
new file mode 100644
index 00000000..4f754735
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/672_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en
new file mode 100644
index 00000000..1c6166b9
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/673_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en
new file mode 100644
index 00000000..96bb0674
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/678_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en
new file mode 100644
index 00000000..698326fb
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/679_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
index 64d9cd49..3a4b0119 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/680_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en
new file mode 100644
index 00000000..8efd06dc
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/682_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en
new file mode 100644
index 00000000..f437acde
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/685_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
index 1697bec9..32876c45 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en
new file mode 100644
index 00000000..95e83155
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/689_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en
new file mode 100644
index 00000000..e0aea52f
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/690_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
index 19e0566c..efc7c54e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
index 7ac8a630..afce4a6d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/7_ru
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
index 8adf5298..d5d7ac5f 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
index 2153b5a0..d301aa0b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/81_ja
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en
new file mode 100644
index 00000000..dd382d05
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/850_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
index febe1918..14db15a8 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/880_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
index ef765f55..fdaa487d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
index e2506851..923fe0a3 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/886_zh
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
index 3ab469b7..4800528b 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/91_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en
new file mode 100644
index 00000000..8561f835
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/92_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
index 7fab12a6..886e42ab 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/94_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en
new file mode 100644
index 00000000..fde89900
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/961_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
index 37a2bf85..c4d61bc1 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/962_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en
new file mode 100644
index 00000000..065e3561
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/963_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en
new file mode 100644
index 00000000..3d2ffc80
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/967_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en
new file mode 100644
index 00000000..43a8e954
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/970_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en
new file mode 100644
index 00000000..48273faf
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/971_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en
new file mode 100644
index 00000000..cd0e4cf5
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/993_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
index 69468e9e..b3eadf7c 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/994_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en
new file mode 100644
index 00000000..89b3600e
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/995_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
index 46b794d7..16d44e69 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/996_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
index 7c428d0f..49659897 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
index 330087d8..a2c80e64 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
index 5432f670..cca8a0b8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
@@ -30,9 +30,9 @@ import java.util.Set;
 public class AlternateFormatsCountryCodeSet {
   // A set of all country codes for which data is available.
   static Set<Integer> getCountryCodeSet() {
-    // The capacity is set to 62 as there are 47 different entries,
+    // The capacity is set to 61 as there are 46 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<Integer> countryCodeSet = new HashSet<Integer>(62);
+    Set<Integer> countryCodeSet = new HashSet<Integer>(61);
 
     countryCodeSet.add(7);
     countryCodeSet.add(27);
@@ -50,7 +50,6 @@ public class AlternateFormatsCountryCodeSet {
     countryCodeSet.add(58);
     countryCodeSet.add(61);
     countryCodeSet.add(62);
-    countryCodeSet.add(63);
     countryCodeSet.add(64);
     countryCodeSet.add(66);
     countryCodeSet.add(81);
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
index 68744b56..f41f7e1c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -64,7 +64,7 @@ public class AsYouTypeFormatter {
   // code, from the national number.
   private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
   private static final PhoneMetadata EMPTY_METADATA =
-      new PhoneMetadata().setInternationalPrefix("NA");
+      PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build();
   private PhoneMetadata defaultMetadata;
   private PhoneMetadata currentMetadata;
 
@@ -72,10 +72,12 @@ public class AsYouTypeFormatter {
   // used by the AYTF. It is eligible when the format element under numberFormat contains groups of
   // the dollar sign followed by a single digit, separated by valid phone number punctuation. This
   // prevents invalid punctuation (such as the star sign in Israeli star numbers) getting into the
-  // output of the AYTF.
+  // output of the AYTF. We require that the first group is present in the output pattern to ensure
+  // no data is lost while formatting; when we format as you type, this should always be the case.
   private static final Pattern ELIGIBLE_FORMAT_PATTERN =
       Pattern.compile("[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*"
-          + "(\\$\\d" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)+");
+          + "\\$1" + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*(\\$\\d"
+          + "[" + PhoneNumberUtil.VALID_PUNCTUATION + "]*)*");
   // A set of characters that, if found in a national prefix formatting rules, are an indicator to
   // us that we should separate the national prefix from the number when formatting.
   private static final Pattern NATIONAL_PREFIX_SEPARATORS_PATTERN = Pattern.compile("[- ]");
@@ -168,9 +170,9 @@ public class AsYouTypeFormatter {
     // First decide whether we should use international or national number rules.
     boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
     List<NumberFormat> formatList =
-        (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
-            ? currentMetadata.intlNumberFormats()
-            : currentMetadata.numberFormats();
+        (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0)
+            ? currentMetadata.getIntlNumberFormatList()
+            : currentMetadata.getNumberFormatList();
     for (NumberFormat format : formatList) {
       // Discard a few formats that we know are not relevant based on the presence of the national
       // prefix.
@@ -205,12 +207,12 @@ public class AsYouTypeFormatter {
     Iterator<NumberFormat> it = possibleFormats.iterator();
     while (it.hasNext()) {
       NumberFormat format = it.next();
-      if (format.leadingDigitsPatternSize() == 0) {
+      if (format.getLeadingDigitsPatternCount() == 0) {
         // Keep everything that isn't restricted by leading digits.
         continue;
       }
       int lastLeadingDigitsPattern =
-          Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
+          Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1);
       Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
           format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
       Matcher m = leadingDigitsPattern.matcher(leadingDigits);
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
index 1d484819..2e2d96a3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -579,8 +579,8 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
         MetadataManager.getAlternateFormatsForCountry(number.getCountryCode());
     String nationalSignificantNumber = util.getNationalSignificantNumber(number);
     if (alternateFormats != null) {
-      for (NumberFormat alternateFormat : alternateFormats.numberFormats()) {
-        if (alternateFormat.leadingDigitsPatternSize() > 0) {
+      for (NumberFormat alternateFormat : alternateFormats.getNumberFormatList()) {
+        if (alternateFormat.getLeadingDigitsPatternCount() > 0) {
           // There is only one leading digits pattern for alternate formats.
           Pattern pattern =
               regexCache.getPatternForRegex(alternateFormat.getLeadingDigitsPattern(0));
@@ -668,7 +668,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
     // Check if a national prefix should be present when formatting this number.
     String nationalNumber = util.getNationalSignificantNumber(number);
     NumberFormat formatRule =
-        util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+        util.chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
     // To do this, we check that a national prefix formatting rule was present and that it wasn't
     // just the first-group symbol ($1) with punctuation.
     if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index a49914a2..95e4c4e7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -305,46 +305,98 @@ public class PhoneNumberUtil {
   // as the default extension prefix. This can be overridden by region-specific preferences.
   private static final String DEFAULT_EXTN_PREFIX = " ext. ";
 
-  // Pattern to capture digits used in an extension. Places a maximum length of "7" for an
-  // extension.
-  private static final String CAPTURING_EXTN_DIGITS = "(" + DIGITS + "{1,7})";
   // Regexp of all possible ways to write extensions, for use when parsing. This will be run as a
   // case-insensitive regexp match. Wide character versions are also provided after each ASCII
   // version.
-  private static final String EXTN_PATTERNS_FOR_PARSING;
-  static final String EXTN_PATTERNS_FOR_MATCHING;
-  static {
-    // One-character symbols that can be used to indicate an extension.
-    String singleExtnSymbolsForMatching = "x\uFF58#\uFF03~\uFF5E";
-    // For parsing, we are slightly more lenient in our interpretation than for matching. Here we
-    // allow "comma" and "semicolon" as possible extension indicators. When matching, these are
-    // hardly ever used to indicate this.
-    String singleExtnSymbolsForParsing = ",;" + singleExtnSymbolsForMatching;
-
-    EXTN_PATTERNS_FOR_PARSING = createExtnPattern(singleExtnSymbolsForParsing);
-    EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(singleExtnSymbolsForMatching);
-  }
-
-  /**
-   * Helper initialiser method to create the regular-expression pattern to match extensions,
-   * allowing the one-char extension symbols provided by {@code singleExtnSymbols}.
-   */
-  private static String createExtnPattern(String singleExtnSymbols) {
-    // There are three regular expressions here. The first covers RFC 3966 format, where the
-    // extension is added using ";ext=". The second more generic one starts with optional white
-    // space and ends with an optional full stop (.), followed by zero or more spaces/tabs/commas
-    // and then the numbers themselves. The other one covers the special case of American numbers
-    // where the extension is written with a hash at the end, such as "- 503#"
-    // Note that the only capturing groups should be around the digits that you want to capture as
-    // part of the extension, or else parsing will fail!
-    // Canonical-equivalence doesn't seem to be an option with Android java, so we allow two options
-    // for representing the accented o - the character itself, and one in the unicode decomposed
-    // form with the combining acute accent.
-    return (RFC3966_EXTN_PREFIX + CAPTURING_EXTN_DIGITS + "|" + "[ \u00A0\\t,]*"
-        + "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|"
-        + "\u0434\u043E\u0431|" + "[" + singleExtnSymbols + "]|int|anexo|\uFF49\uFF4E\uFF54)"
-        + "[:\\.\uFF0E]?[ \u00A0\\t,-]*" + CAPTURING_EXTN_DIGITS + "#?|"
-        + "[- ]+(" + DIGITS + "{1,5})#");
+  private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true);
+  static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false);
+  
+  /** 
+   * Helper method for constructing regular expressions for parsing. Creates an expression that
+   * captures up to maxLength digits.
+   */
+  private static String extnDigits(int maxLength) {
+    return "(" + DIGITS + "{1," + maxLength + "})";
+  }
+
+  /**
+   * Helper initialiser method to create the regular-expression pattern to match extensions.
+   * Note that there are currently six capturing groups for the extension itself. If this number is
+   * changed, MaybeStripExtension needs to be updated.
+   */
+  private static String createExtnPattern(boolean forParsing) {
+    // We cap the maximum length of an extension based on the ambiguity of the way the extension is
+    // prefixed. As per ITU, the officially allowed length for extensions is actually 40, but we
+    // don't support this since we haven't seen real examples and this introduces many false
+    // interpretations as the extension labels are not standardized.
+    int extLimitAfterExplicitLabel = 20;
+    int extLimitAfterLikelyLabel = 15;
+    int extLimitAfterAmbiguousChar = 9;
+    int extLimitWhenNotSure = 6;
+
+    String possibleSeparatorsBetweenNumberAndExtLabel = "[ \u00A0\\t,]*";
+    // Optional full stop (.) or colon, followed by zero or more spaces/tabs/commas.
+    String possibleCharsAfterExtLabel = "[:\\.\uFF0E]?[ \u00A0\\t,-]*";
+    String optionalExtnSuffix = "#?";
+
+    // Here the extension is called out in more explicit way, i.e mentioning it obvious patterns
+    // like "ext.". Canonical-equivalence doesn't seem to be an option with Android java, so we
+    // allow two options for representing the accented o - the character itself, and one in the
+    // unicode decomposed form with the combining acute accent.
+    String explicitExtLabels =
+        "(?:e?xt(?:ensi(?:o\u0301?|\u00F3))?n?|\uFF45?\uFF58\uFF54\uFF4E?|\u0434\u043E\u0431|anexo)";
+    // One-character symbols that can be used to indicate an extension, and less commonly used
+    // or more ambiguous extension labels.
+    String ambiguousExtLabels = "(?:[x\uFF58#\uFF03~\uFF5E]|int|\uFF49\uFF4E\uFF54)";
+    // When extension is not separated clearly.
+    String ambiguousSeparator = "[- ]+";
+
+    String rfcExtn = RFC3966_EXTN_PREFIX + extnDigits(extLimitAfterExplicitLabel);
+    String explicitExtn = possibleSeparatorsBetweenNumberAndExtLabel + explicitExtLabels
+        + possibleCharsAfterExtLabel + extnDigits(extLimitAfterExplicitLabel)
+        + optionalExtnSuffix;
+    String ambiguousExtn = possibleSeparatorsBetweenNumberAndExtLabel + ambiguousExtLabels
+        + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar) + optionalExtnSuffix;
+    String americanStyleExtnWithSuffix = ambiguousSeparator + extnDigits(extLimitWhenNotSure) + "#";
+
+    // The first regular expression covers RFC 3966 format, where the extension is added using
+    // ";ext=". The second more generic where extension is mentioned with explicit labels like
+    // "ext:". In both the above cases we allow more numbers in extension than any other extension
+    // labels. The third one captures when single character extension labels or less commonly used
+    // labels are used. In such cases we capture fewer extension digits in order to reduce the
+    // chance of falsely interpreting two numbers beside each other as a number + extension. The
+    // fourth one covers the special case of American numbers where the extension is written with a
+    // hash at the end, such as "- 503#".
+    String extensionPattern =
+        rfcExtn + "|"
+        + explicitExtn + "|"
+        + ambiguousExtn + "|"
+        + americanStyleExtnWithSuffix;
+    // Additional pattern that is supported when parsing extensions, not when matching.
+    if (forParsing) {
+      // This is same as possibleSeparatorsBetweenNumberAndExtLabel, but not matching comma as
+      // extension label may have it.
+      String possibleSeparatorsNumberExtLabelNoComma = "[ \u00A0\\t]*";
+      // ",," is commonly used for auto dialling the extension when connected. First comma is matched
+      // through possibleSeparatorsBetweenNumberAndExtLabel, so we do not repeat it here. Semi-colon
+      // works in Iphone and Android also to pop up a button with the extension number following.
+      String autoDiallingAndExtLabelsFound = "(?:,{2}|;)";
+
+      String autoDiallingExtn = possibleSeparatorsNumberExtLabelNoComma
+          + autoDiallingAndExtLabelsFound + possibleCharsAfterExtLabel
+          + extnDigits(extLimitAfterLikelyLabel) +  optionalExtnSuffix;
+      String onlyCommasExtn = possibleSeparatorsNumberExtLabelNoComma
+        + "(?:,)+" + possibleCharsAfterExtLabel + extnDigits(extLimitAfterAmbiguousChar)
+        + optionalExtnSuffix;
+      // Here the first pattern is exclusively for extension autodialling formats which are used
+      // when dialling and in this case we accept longer extensions. However, the second pattern
+      // is more liberal on the number of commas that acts as extension labels, so we have a strict
+      // cap on the number of digits in such extensions.
+      return extensionPattern + "|"
+          + autoDiallingExtn + "|"
+          + onlyCommasExtn;
+    }
+    return extensionPattern;
   }
 
   // Regexp of all known extension prefixes used by different regions followed by 1 or more valid
@@ -1341,7 +1393,7 @@ public class PhoneNumberUtil {
         }
       }
       formattedNumber.append(
-          formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy, numberFormat));
+          formatNsnUsingPattern(nationalSignificantNumber, numFormatCopy.build(), numberFormat));
     }
     maybeAppendFormattedExtension(number, metadata, numberFormat, formattedNumber);
     prefixNumberWithCountryCallingCode(countryCallingCode, numberFormat, formattedNumber);
@@ -1559,14 +1611,15 @@ public class PhoneNumberUtil {
     PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom);
     String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix();
 
-    // For regions that have multiple international prefixes, the international format of the
-    // number is returned, unless there is a preferred international prefix.
+    // In general, if there is a preferred international prefix, use that. Otherwise, for regions
+    // that have multiple international prefixes, the international format of the number is
+    // returned since we would not know which one to use.
     String internationalPrefixForFormatting = "";
-    if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
-      internationalPrefixForFormatting = internationalPrefix;
-    } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
+    if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) {
       internationalPrefixForFormatting =
           metadataForRegionCallingFrom.getPreferredInternationalPrefix();
+    } else if (SINGLE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) {
+      internationalPrefixForFormatting = internationalPrefix;
     }
 
     String regionCode = getRegionCodeForCountryCode(countryCallingCode);
@@ -1651,7 +1704,7 @@ public class PhoneNumberUtil {
         PhoneMetadata metadata = getMetadataForRegion(regionCode);
         String nationalNumber = getNationalSignificantNumber(number);
         NumberFormat formatRule =
-            chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+            chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
         // The format rule could still be null here if the national number was 0 and there was no
         // raw input (this should not be possible for numbers generated by the phonenumber library
         // as they would also not have a country calling code and we would have exited earlier).
@@ -1683,7 +1736,7 @@ public class PhoneNumberUtil {
         numFormatCopy.mergeFrom(formatRule);
         numFormatCopy.clearNationalPrefixFormattingRule();
         List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1);
-        numberFormats.add(numFormatCopy);
+        numberFormats.add(numFormatCopy.build());
         formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats);
         break;
     }
@@ -1730,7 +1783,7 @@ public class PhoneNumberUtil {
     }
     String nationalNumber = getNationalSignificantNumber(number);
     NumberFormat formatRule =
-        chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+        chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
     return formatRule != null;
   }
 
@@ -1794,7 +1847,7 @@ public class PhoneNumberUtil {
     } else if (metadataForRegionCallingFrom != null
         && countryCode == getCountryCodeForValidRegion(regionCallingFrom)) {
       NumberFormat formattingPattern =
-          chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(),
+          chooseFormattingPatternForNumber(metadataForRegionCallingFrom.getNumberFormatList(),
                                            nationalNumber);
       if (formattingPattern == null) {
         // If no pattern above is matched, we format the original input.
@@ -1811,7 +1864,7 @@ public class PhoneNumberUtil {
       // This will not work in the cases where the pattern (and not the leading digits) decide
       // whether a national prefix needs to be used, since we have overridden the pattern to match
       // anything, but that is not the case in the metadata to date.
-      return formatNsnUsingPattern(rawInput, newFormat, PhoneNumberFormat.NATIONAL);
+      return formatNsnUsingPattern(rawInput, newFormat.build(), PhoneNumberFormat.NATIONAL);
     }
     String internationalPrefixForFormatting = "";
     // If an unsupported region-calling-from is entered, or a country with multiple international
@@ -1905,13 +1958,13 @@ public class PhoneNumberUtil {
                            PhoneMetadata metadata,
                            PhoneNumberFormat numberFormat,
                            CharSequence carrierCode) {
-    List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats();
+    List<NumberFormat> intlNumberFormats = metadata.getIntlNumberFormatList();
     // When the intlNumberFormats exists, we use that to format national number for the
     // INTERNATIONAL format instead of using the numberDesc.numberFormats.
     List<NumberFormat> availableFormats =
         (intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL)
-        ? metadata.numberFormats()
-        : metadata.intlNumberFormats();
+        ? metadata.getNumberFormatList()
+        : metadata.getIntlNumberFormatList();
     NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number);
     return (formattingPattern == null)
         ? number
@@ -1921,7 +1974,7 @@ public class PhoneNumberUtil {
   NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
                                                 String nationalNumber) {
     for (NumberFormat numFormat : availableFormats) {
-      int size = numFormat.leadingDigitsPatternSize();
+      int size = numFormat.getLeadingDigitsPatternCount();
       if (size == 0 || regexCache.getPatternForRegex(
               // We always use the last leading_digits_pattern, as it is the most detailed.
               numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
@@ -2578,7 +2631,7 @@ public class PhoneNumberUtil {
           // Note that when adding the possible lengths from mobile, we have to again check they
           // aren't empty since if they are this indicates they are the same as the general desc and
           // should be obtained from there.
-          possibleLengths.addAll(mobileDesc.getPossibleLengthList().size() == 0
+          possibleLengths.addAll(mobileDesc.getPossibleLengthCount() == 0
               ? metadata.getGeneralDesc().getPossibleLengthList()
               : mobileDesc.getPossibleLengthList());
           // The current list is sorted; we need to merge in the new list and re-sort (duplicates
@@ -3564,6 +3617,6 @@ public class PhoneNumberUtil {
       logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode);
       return false;
     }
-    return metadata.isMobileNumberPortableRegion();
+    return metadata.getMobileNumberPortableRegion();
   }
 }
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
index 966ed39a..5ac36b4e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
@@ -113,7 +113,9 @@ public final class Phonemetadata {
       return leadingDigitsPattern_;
     }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); }
+    @Deprecated
+    public int leadingDigitsPatternSize() { return getLeadingDigitsPatternCount(); }
+    public int getLeadingDigitsPatternCount() { return leadingDigitsPattern_.size(); }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
     public String getLeadingDigitsPattern(int index) {
       return leadingDigitsPattern_.get(index);
@@ -384,6 +386,16 @@ public final class Phonemetadata {
       public PhoneMetadata build() {
         return this;
       }
+
+      public Builder setId(String value) {
+        super.setId(value);
+        return this;
+      }
+
+      public Builder setInternationalPrefix(String value) {
+        super.setInternationalPrefix(value);
+        return this;
+      }
     }
     public static Builder newBuilder() {
       return new Builder();
@@ -395,6 +407,12 @@ public final class Phonemetadata {
     public boolean hasGeneralDesc() { return hasGeneralDesc; }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
     public PhoneNumberDesc getGeneralDesc() { return generalDesc_; }
+    public PhoneNumberDesc getGeneralDescBuilder() {
+      if (generalDesc_ == null) {
+        generalDesc_ = new PhoneNumberDesc();
+      }
+      return generalDesc_ ;
+    }
     public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) {
       if (value == null) {
         throw new NullPointerException();
@@ -761,10 +779,16 @@ public final class Phonemetadata {
     // repeated NumberFormat number_format = 19;
     private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>();
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
+    @Deprecated
     public java.util.List<NumberFormat> numberFormats() {
+      return getNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getNumberFormatList() {
       return numberFormat_;
     }
-    public int numberFormatSize() { return numberFormat_.size(); }
+    @Deprecated
+    public int numberFormatSize() { return getNumberFormatCount(); }
+    public int getNumberFormatCount() { return numberFormat_.size(); }
     public NumberFormat getNumberFormat(int index) {
       return numberFormat_.get(index);
     }
@@ -780,10 +804,16 @@ public final class Phonemetadata {
     private java.util.List<NumberFormat> intlNumberFormat_ =
         new java.util.ArrayList<NumberFormat>();
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
+    @Deprecated
     public java.util.List<NumberFormat> intlNumberFormats() {
+      return getIntlNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getIntlNumberFormatList() {
       return intlNumberFormat_;
     }
-    public int intlNumberFormatSize() { return intlNumberFormat_.size(); }
+    @Deprecated
+    public int intlNumberFormatSize() { return getIntlNumberFormatCount(); }
+    public int getIntlNumberFormatCount() { return intlNumberFormat_.size(); }
     public NumberFormat getIntlNumberFormat(int index) {
       return intlNumberFormat_.get(index);
     }
@@ -850,7 +880,9 @@ public final class Phonemetadata {
     private boolean hasMobileNumberPortableRegion;
     private boolean mobileNumberPortableRegion_ = false;
     public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; }
-    public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
+    @Deprecated
+    public boolean isMobileNumberPortableRegion() { return getMobileNumberPortableRegion(); }
+    public boolean getMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
     public PhoneMetadata setMobileNumberPortableRegion(boolean value) {
       hasMobileNumberPortableRegion = true;
       mobileNumberPortableRegion_ = value;
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
index 05b94d6b..12f1745c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
@@ -30,9 +30,9 @@ import java.util.Set;
 public class ShortNumbersRegionCodeSet {
   // A set of all region codes for which data is available.
   static Set<String> getRegionCodeSet() {
-    // The capacity is set to 320 as there are 240 different entries,
+    // The capacity is set to 321 as there are 241 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<String> regionCodeSet = new HashSet<String>(320);
+    Set<String> regionCodeSet = new HashSet<String>(321);
 
     regionCodeSet.add("AC");
     regionCodeSet.add("AD");
@@ -235,6 +235,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("SN");
     regionCodeSet.add("SO");
     regionCodeSet.add("SR");
+    regionCodeSet.add("SS");
     regionCodeSet.add("ST");
     regionCodeSet.add("SV");
     regionCodeSet.add("SX");
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
index 5e102704..015808af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
index d03d525b..4d46fcfb 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
index 1e50e33e..8f8615dd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
index ac762db9..6806a009 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
index ef8f6b9d..0500b27a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
index fe18ba0e..8fac331c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
index 89d4f920..c26e30d3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
index 2c8b5d51..62b75020 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
index 590270ab..6813bd51 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
index 24f6ff3e..a84d8785 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index f70855f1..66dd630c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index 59ef115b..17508f94 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index 11ed1358..dfe50786 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index fa9d67fb..6ba5be41 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index 46f7d482..3af1e388 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index 77742834..cb06fb83 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index 518d27a1..41c00923 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 0bfb1c81..29424fbe 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index 1edc8ec4..a54f4ca3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 0e277525..8367ee94 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index 8a07a997..9da6fb14 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 90111031..6cb25d70 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index cdfe19ba..401dafe0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index af69fa2d..339334bf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index a7456163..71e260e1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index 0ebc3f86..01bb8dac 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 99930e05..dc01444b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index ae149ccd..37bcc552 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 2fc3fcb7..3214db5b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index cb1ca409..8fa119b2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index ea1d50ea..bb43464a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 975e2430..8dc7785d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index 263dda59..efa9b058 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index c5c88df0..06ea5190 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
index 3a02a3db..8c396100 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index 871bc2a4..ed648e4b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index 82c1b462..6ccdd69a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index f6de5b1f..e1cab68c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index ed1330d6..21bc8097 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 9129855c..5e981c85 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index 702957a8..b29ac005 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index 66c94bfe..7f8a039b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index afdb010e..8236543d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index 2260b6a6..e7e30ac1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index f37beafa..8d341fb6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index ba1b00f8..d98c24a6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index 01977cc1..ddebc8f7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index f07ac532..283e679d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index a34eebe8..3f7fcbbc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index 5ae18de6..492f70af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 784fbc38..602a7124 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index c5e3a73a..fcd3965c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index c7a35b3d..c06344a6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index 201c513b..bfa1f137 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index e7ac5d99..3a938dfe 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index 750a8189..ebb5fb49 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index e3e520f0..dc4b525c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 64ecb2d6..2b89782e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 2de0b7dc..5a7271eb 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index bf25f427..051f5032 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index adcbef31..6128ffe2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 75c7e4ed..cdfd1f86 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 05362f0d..b8763e6a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index c50382b1..43163312 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index cf08564c..02871045 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index 555cd7f7..33d742f9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 4f1787a0..5a377cf9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index c4a58d57..4520dc95 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index 818108b5..c7ee185a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index fd88ec85..d52abcfc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index f75507be..4f5eea54 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index 75ebe2ae..b11e9fda 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index 95116db1..e11e957c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 46262b95..009e48ab 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index cc84dd5c..8a056eb2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index df48e2e2..e1da75ca 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index e35c8669..296fcf9d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index 41b16c84..b86a9ebb 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index 830e1906..9fdea277 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index 647c0f5e..523e2b95 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index 2a1014fd..eb13b979 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index 1c997465..d0da8506 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index bcfab3b1..3259f87a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index d08ab51b..c3e4ea97 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index 1f8a02eb..f6a759c8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index 8f9af666..fa3499ac 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 5424db93..7d938623 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 3d3105e2..00752953 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index b1b53ac3..11de05ac 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 150cedd4..93dc67aa 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 8bbe40c5..6ce88ce9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 7715a991..28a2ba41 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index f543a577..993af32f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 0fd10f3e..50b27e6b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 1322f537..9489e89a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 8263606f..8a720626 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index 74276025..c75dce67 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index c675b33e..0cea04e8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index 0c26eba0..bd6d7e51 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index 62d29a61..fa01bc2c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 5c8fcbdb..3588cb14 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index cccb1135..97585357 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index 3924858d..ec6030f6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 56af97a8..7672fa34 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 7f84e6a1..1042b05f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index 329ba106..dc8fdc2e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index 766d17fe..0c9dd320 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 8474b60f..9c1a73fb 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index bdcc2ce5..54c5bec9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index 9dbb9098..a86322af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index 6905f1c7..4ba22785 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index 138f831c..bc037fa0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index f8d42e1b..33f69238 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 78958eea..99dbcc09 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index 27ef5699..85135ca2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 37f28c5f..76b8bc9f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index f2a49339..265c4001 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 0469e249..4574615b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index 3f80cf8d..2a00a071 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 61bf8c59..94c3debf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 8ddfa2c2..0849ea33 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index 283a8f1f..47c2eec0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 5bef260d..9a57e591 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index ca211896..9aec8765 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index e4c2c8e1..a4d20b89 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 28b30d39..8df82b0e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index ab0eb3eb..89b4bcc3 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index f24e3ce6..213fd6e6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index c0b73d1b..7efdbaee 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index 03c5ef36..dbd636e5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index b3159b57..5ab6a0d6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 10ea2dac..842413ab 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index 628b3e6e..41b92f5b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index bba1e5b8..f8b5f35c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 21820fa1..51ff6a48 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index 0e2f088c..cde7ce65 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index 3e8227de..669f02a5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 5daadbf8..365bafd7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index f0370fdc..594de97c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index 3a4940d5..a885cb56 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index afd1bb6d..4622c358 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 28d2155d..7188cf21 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index 5c6c8db7..bc9cbd83 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index 0e50b28a..7c92f624 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index 13c181b8..32c86450 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 9d8fb703..12173c6b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 4d253b1c..6e068111 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 104b4897..36dc1e39 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index 91b1c265..996df6d1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 99e0866f..49e38ad9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index 26b59f40..eb715841 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index e51eab37..6ec881ff 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 3060a189..45b707a5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index 0e274840..7eae3103 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index 18719fc8..81dd47e2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index c60a796f..9d5a91b7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index 3cc8906f..7881bc52 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index 567bc896..56449a39 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index 56f4ca50..305b85e9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index e3b9d7ac..67735fad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index b5bf1341..aa7672ef 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 8dc8e7f1..15e4a2a7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index d9615cdc..78bb1e13 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 3f4c84e9..981177cd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 81f1f6ba..857b6d9b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index aa0ec2ba..dddb34ea 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index cdd4e2c5..bececb62 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index 7c60466a..5e3bcf81 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index 5a5d1bee..c8b36297 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index 60fe5d9e..caeb2ec4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index c866916f..15c760fd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index dd71bafa..7b882a2f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index 085354c8..fb9422cc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index 2d4aa179..d3d777cf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 6d881b4b..0e2e60c2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index a9a460f8..2b1ed7fc 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 4763de63..0688624f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index 1f0b7257..77b405f4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index 315a4441..def0b3e5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index b1fd0787..3e56482a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index 814458c2..cc506d61 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
index f4a21ec4..c2bb116e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index 804576e8..06dcf45d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index 41aadc81..b0fd135b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index ee304f1d..1f1ce10f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index c76cd56f..23c56495 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index ae8a5d54..c11bfe39 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index 4d8a8c4d..9133378e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 58c49b49..4b6aa0b7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index f80317e3..13d96260 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index 0d19153c..46181d0a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index aa999aa2..93be3b41 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 5cb4c709..0a6dc03c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index 545acd6c..ddbeb93b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index 099abadd..80164d3f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index 9ddaa6d0..cac43d94 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 77b1c37e..19a6bcce 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index 1b38fad9..d08e73c7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 4fd5bef1..f8859190 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index 7af1941b..ac1bd52b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index dd28438a..b33e278c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index f6a9ca7c..2542dace 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 63c6552c..7cfd32e7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 26a0a833..2e7992dd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 7def0b04..057bc582 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index b0a9091b..b340ff45 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index 37a25cdc..0a8fd5af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index 2f76125e..4512db73 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index ed5f1c22..70902367 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index 120733ed..a4fdd21e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
index ec0dc882..dc8edc13 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index 11964154..e64d262d 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index b1d2c0be..cec9da09 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index 12ff2b2e..ab361706 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index c2db1226..9cad69b6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 6dab4fda..7b82adf7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
index 7ab70d5d..2fbdcd86 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
index 4e0a8f00..64f218f0 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
index feefd0bf..b940c977 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
index d7944585..1813fab9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
index 583c0c53..ab062589 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
index 7b613184..00428671 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
index ae066ec5..46bf730e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
index 839a4a68..31f262db 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
index 9a777b7d..bfb86341 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
index ff54ca3c..13b2e9ef 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
index 14d3b763..abfff579 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
index 51e48ad1..3695f2c5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
index f674cb16..83cf4915 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
index fb4de36d..5e165911 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
index fdb71237..9bb22e08 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
index 78f089fe..c901e022 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
index 13fe8a60..e9614518 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
index 2a56c461..5b88b7a5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
index 4ca8ec77..f9d3bca2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
index ab4b2adc..1aa16bb6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
index 8053fb9d..2041eca9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
index f1502523..ec2c9fd2 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
index 98b57910..850ba175 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
index deaa0e81..ea33a674 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
index daf2bcd5..08e25202 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
index 97a01cc9..fd3e40fe 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
index 58d71349..4683a448 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
index 7039793d..aebc1cf5 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
index 6a92ffa6..bc6a0ccf 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
index c6aea9b1..86b5c43e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
index 49a20b39..03cf2c35 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
index dbd573a1..50e29a47 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
index 510227c5..ee529825 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
index c4fc13a1..7f353725 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
index c5b01cd7..6c8e21e8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
index 05486d0b..531a36af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
index 2f817568..392bc44a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
index 84888cde..bd7b5163 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
index 776bb83b..8c900031 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
index 3ded7e00..364316d6 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
index 8b2fc41a..0a823446 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
index 5b95e0af..0c3664fa 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
index 0ccb213a..90f87cd4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
index 0458496e..f288a7ce 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
index aca98576..9d77fc15 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
index 15ffc494..5de895ff 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
index 6a92ce3e..3b460298 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
index d6477602..6a3ac5b1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
index bf7eb3ff..77d9e3ec 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
index 0ddedf6e..eb3734c9 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
index a71337b6..53ab50c4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
index 4860822a..c888bcb1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
index d6b1c18c..106b9fc1 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
index d50a5a0b..ce332e75 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
index 0ba762ba..9b5aabdd 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
index 07f849f8..480c607b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
index 1d904c20..9e0046f7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
index 001199f9..ebaac114 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
index e1a6e8f8..191f503f 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
index 42355f3f..05e8cf7a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
index 174c0e95..0217bfd7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
new file mode 100644
index 00000000..a2d700a3
--- /dev/null
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SS
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
index ca67d4fe..ea017d00 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
index ee931b6b..8a301f43 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
index 174a66c8..0e4b300a 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
index 8e22d994..fd3a1fd7 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
index 7c246698..f3c193ba 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
index f5189985..ee5e4fde 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
index d3afe7e2..7f3a75af 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
index 0dc8de2f..91563bad 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
index bb0cb822..b977ac2b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
index 28c638a8..c0b38677 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_US
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
index 18bbe336..6b22eade 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
index dc912d71..a91f9253 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
index cdfdd926..b8e1de87 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
index ab79ab83..011b07b8 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_WS