JAVA: Move java code to java/libphonenumber.

This is required for the incoming Maven refactoring adding a separate geocoder module.

BUG=57

Review URL: http://codereview.appspot.com/5376090

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@390 ee073f10-1060-11df-b6a4-87a95322a99c

740 files changed, 99 insertions, 106 deletions

diff --git a/java/build.xml b/java/libphonenumber/build.xml
index bab4732..172c265 100644
--- a/java/build.xml
+++ b/java/libphonenumber/build.xml
@@ -6,15 +6,19 @@
   <property name="build.dir" value="build"/>
   <property name="classes.dir" value="${build.dir}/classes"/>
   <property name="jar.dir" value="${build.dir}/jar"/>
-  <property name="lib.dir" value="lib"/>
+  <property name="lib.dir" value="../lib"/>
   <property name="report.dir" value="${build.dir}/junitreport"/>
+  <property name="resources.dir" value="../../resources/"/>
+  <property name="javascript.dir" value="../../javascript/"/>
+  <property name="build.tools.jar"
+      value="../../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
 
   <path id="classpath">
     <fileset dir="${lib.dir}" includes="**/*.jar"/>
   </path>
   <path id="test.classpath">
     <pathelement location="${classes.dir}"/>
-    <pathelement location="lib/junit/junit-4.8.1.jar"/>
+    <pathelement location="${lib.dir}/junit-4.8.1.jar"/>
     <pathelement location="${jar.dir}/${ant.project.name}-test.jar"/>
     <fileset dir="${lib.dir}">
       <include name="**/*.jar"/>
@@ -24,9 +28,9 @@
   <target name="build-metadata">
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="../resources/PhoneNumberMetaData.xml"/>
+      <arg value="${resources.dir}/PhoneNumberMetaData.xml"/>
       <arg value="src"/>
       <arg value="false"/> <!-- Not for testing. -->
       <arg value="false"/> <!-- No lite metadata. -->
@@ -36,9 +40,9 @@
   <target name="build-test-metadata">
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="../resources/PhoneNumberMetaDataForTesting.xml"/>
+      <arg value="${resources.dir}/PhoneNumberMetaDataForTesting.xml"/>
       <arg value="test"/>
       <arg value="true"/> <!-- For testing. -->
       <arg value="false"/> <!-- No lite metadata. -->
@@ -48,9 +52,9 @@
   <target name="build-geo-data">
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="GenerateAreaCodeData"/>
-      <arg value="../resources/geocoding/"/>
+      <arg value="${resources.dir}/geocoding/"/>
       <arg value="src/com/google/i18n/phonenumbers/geocoding/data"/>
     </exec>
   </target>
@@ -58,9 +62,9 @@
   <target name="build-geo-test-data">
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="GenerateAreaCodeData"/>
-      <arg value="../resources/test/geocoding/"/>
+      <arg value="${resources.dir}/test/geocoding/"/>
       <arg value="test/com/google/i18n/phonenumbers/geocoding/testing_data"/>
     </exec>
   </target>
@@ -68,25 +72,25 @@
   <target name="build-js-metadata">
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="../resources/PhoneNumberMetaData.xml"/>
-      <arg value="../javascript/i18n/phonenumbers/metadata.js"/>
+      <arg value="${resources.dir}/PhoneNumberMetaData.xml"/>
+      <arg value="${javascript.dir}/i18n/phonenumbers/metadata.js"/>
     </exec>
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="../resources/PhoneNumberMetaData.xml"/>
-      <arg value="../javascript/i18n/phonenumbers/metadatalite.js"/>
+      <arg value="${resources.dir}/PhoneNumberMetaData.xml"/>
+      <arg value="${javascript.dir}/i18n/phonenumbers/metadatalite.js"/>
       <arg value="true"/> <!-- Lite metadata. -->
     </exec>
     <exec executable="java">
       <arg value="-jar" />
-      <arg value="../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar"/>
+      <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="../resources/PhoneNumberMetaDataForTesting.xml"/>
-      <arg value="../javascript/i18n/phonenumbers/metadatafortesting.js"/>
+      <arg value="${resources.dir}/PhoneNumberMetaDataForTesting.xml"/>
+      <arg value="${javascript.dir}/i18n/phonenumbers/metadatafortesting.js"/>
     </exec>
   </target>
 
diff --git a/java/pom.xml b/java/libphonenumber/pom.xml
index 32cdd14..2a4a9ae 100644
--- a/java/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -191,93 +191,6 @@
         </plugins>
       </build>
     </profile>
-    <!-- Development profile that triggers the metadata generation. -->
-    <profile>
-      <id>dev</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2</version>
-            <executions>
-              <execution>
-                <id>build-metadata</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>java</executable>
-                  <arguments>
-                    <argument>-jar</argument>
-                    <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                    <argument>BuildMetadataProtoFromXml</argument>
-                    <argument>../resources/PhoneNumberMetaData.xml</argument>
-                    <argument>src</argument>
-                    <argument>false</argument> <!-- Not for testing. -->
-                    <argument>false</argument> <!-- No lite metadata. -->
-                  </arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>build-test-metadata</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>java</executable>
-                  <arguments>
-                    <argument>-jar</argument>
-                    <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                    <argument>BuildMetadataProtoFromXml</argument>
-                    <argument>../resources/PhoneNumberMetaDataForTesting.xml</argument>
-                    <argument>test</argument>
-                    <argument>true</argument> <!-- For testing. -->
-                    <argument>false</argument> <!-- No lite metadata. -->
-                  </arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>build-geo-data</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>java</executable>
-                  <arguments>
-                    <argument>-jar</argument>
-                    <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                    <argument>GenerateAreaCodeData</argument>
-                    <argument>../resources/geocoding</argument>
-                    <argument>src/com/google/i18n/phonenumbers/geocoding/data</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>build-geo-test-data</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>java</executable>
-                  <arguments>
-                    <argument>-jar</argument>
-                    <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                    <argument>GenerateAreaCodeData</argument>
-                    <argument>../resources/test/geocoding</argument>
-                    <argument>test/com/google/i18n/phonenumbers/geocoding/testing_data</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <dependencies>
diff --git a/java/release_notes.txt b/java/libphonenumber/release_notes.txt
index 0fb5dc6..0fb5dc6 100644
--- a/java/release_notes.txt
+++ b/java/libphonenumber/release_notes.txt
diff --git a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index 80eae06..80eae06 100644
--- a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index b69c3ca..b69c3ca 100644
--- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
diff --git a/java/src/com/google/i18n/phonenumbers/NumberParseException.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java
index 7d2bb30..7d2bb30 100644
--- a/java/src/com/google/i18n/phonenumbers/NumberParseException.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
index 5e19b48..5e19b48 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
index 62586f1..62586f1 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index a600334..a600334 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
diff --git a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
index cb3f8b5..cb3f8b5 100644
--- a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java
diff --git a/java/src/com/google/i18n/phonenumbers/Phonenumber.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonenumber.java
index 4ed1563..4ed1563 100644
--- a/java/src/com/google/i18n/phonenumbers/Phonenumber.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/Phonenumber.java
diff --git a/java/src/com/google/i18n/phonenumbers/RegexCache.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/RegexCache.java
index a9ff7e0..a9ff7e0 100644
--- a/java/src/com/google/i18n/phonenumbers/RegexCache.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/RegexCache.java
diff --git a/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
index 2a23d7c..2a23d7c 100644
--- a/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC
index 63a0784..63a0784 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index 5651404..5651404 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
index 5ce6bd9..5ce6bd9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index ce0b677..ce0b677 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index 0fb852a..0fb852a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index 5ec108b..5ec108b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index e7f2d42..e7f2d42 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index 5af20f5..5af20f5 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN
index 27c2ae3..27c2ae3 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
index 77b08cb..77b08cb 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index a39c601..a39c601 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 3b38675..3b38675 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index c38a56c..c38a56c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 2fa06cf..2fa06cf 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW
index fb3aad4..fb3aad4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index c0dbabf..c0dbabf 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index e4b14a6..e4b14a6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index ad4662f..ad4662f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index 982cff9..982cff9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index b6c204a..b6c204a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index b37f61f..b37f61f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 48d20e7..48d20e7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index 2b3c0ae..2b3c0ae 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 841ea9a..841ea9a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index 293ebbc..293ebbc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index e3c5863..e3c5863 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 4987820..4987820 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index d014b2a..d014b2a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index c257c58..c257c58 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO
index f5919ff..f5919ff 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index ec29af2..ec29af2 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index f52796e..f52796e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT
index e549cd7..e549cd7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index 21fd265..21fd265 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index a679105..a679105 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index 5a4d052..5a4d052 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index 5bf386d..5bf386d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index 2f2f8aa..2f2f8aa 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index cf7bba2..cf7bba2 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index e3ce491..e3ce491 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index 2b4128d..2b4128d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH
index 409254a..409254a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index 98198b8..98198b8 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index 2f6fe63..2f6fe63 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index 0e90d89..0e90d89 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index 4018df4..4018df4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index 67a7f5e..67a7f5e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index b1dbb84..b1dbb84 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index cbc064b..cbc064b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index 97e9838..97e9838 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index 4517244..4517244 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index cb8dfd9..cb8dfd9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY
index de1e004..de1e004 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index 5c41a79..5c41a79 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index cfc5b19..cfc5b19 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ
index 5511381..5511381 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index 0082966..0082966 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 723ea80..723ea80 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 0305f76..0305f76 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index 4107335..4107335 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index 343743d..343743d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 28bd9fb..28bd9fb 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 38e39b3..38e39b3 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER
index ae89200..ae89200 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index 9b855f1..9b855f1 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index 8843e54..8843e54 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 604d7ff..604d7ff 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ
index cdd713c..cdd713c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK
index 6c19901..6c19901 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index b4031f0..b4031f0 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index 46dac92..46dac92 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index 66d244e..66d244e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index dddd714..dddd714 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index bd6e72a..bd6e72a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index e120fa5..e120fa5 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index ac5bb57..ac5bb57 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index da17df2..da17df2 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index 0e6809f..0e6809f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index dea89c7..dea89c7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index 7dcc9ff..7dcc9ff 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index d327b75..d327b75 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index 3bf3e41..3bf3e41 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index b0b7406..b0b7406 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index e03584b..e03584b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index 424b068..424b068 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index 655b5b4..655b5b4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT
index a2a20cf..a2a20cf 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index 9a006f1..9a006f1 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW
index 77b6398..77b6398 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index eb36761..eb36761 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index dfd2d09..dfd2d09 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index 6dd47c0..6dd47c0 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index 27a0c8a..27a0c8a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT
index 245ee93..245ee93 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 6ef1306..6ef1306 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index 3d0f8cc..3d0f8cc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 12bc792..12bc792 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index a0f1071..a0f1071 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 8d8c881..8d8c881 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 05b4b50..05b4b50 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO
index a9aa569..a9aa569 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ
index 4009946..4009946 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 9edbc87..9edbc87 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index d281347..d281347 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index d5c2c71..d5c2c71 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index 1908b64..1908b64 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index 81be1e1..81be1e1 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 47058ad..47058ad 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 9db7e6e..9db7e6e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index 68de57a..68de57a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 617ce07..617ce07 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
index 9f757d4..9f757d4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 82bdb90..82bdb90 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index 21570ae..21570ae 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index 5a5f4e8..5a5f4e8 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 42a4b26..42a4b26 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index 47f4390..47f4390 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index 77f805a..77f805a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index cfd2678..cfd2678 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index b129ff6..b129ff6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index 62db7dc..62db7dc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 65b3c94..65b3c94 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index c8a6ad5..c8a6ad5 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index c29d890..c29d890 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index a9a9d2e..a9a9d2e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index f1ce4be..f1ce4be 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS
index e04c603..e04c603 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index 0c11315..0c11315 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 4ffc791..4ffc791 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV
index a76eab9..a76eab9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 8fc1ee7..8fc1ee7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index ef1522a..ef1522a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 79fac1a..79fac1a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index b17e4af..b17e4af 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index 24937fd..24937fd 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 3813149..3813149 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index 072379f..072379f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH
index fc64213..fc64213 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index 3bbd43e..3bbd43e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index 5cce562..5cce562 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index 4f3ea91..4f3ea91 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index 0a7e31a..0a7e31a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 4cf9625..4cf9625 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index 0f9476d..0f9476d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index c48db34..c48db34 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR
index 36db9e4..36db9e4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 969cafc..969cafc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index c2aaa53..c2aaa53 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index d69bd68..d69bd68 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 8841a29..8841a29 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index 7bf7d43..7bf7d43 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index fa3cb40..fa3cb40 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index 07b6b85..07b6b85 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 3d0967a..3d0967a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index 86d10bc..86d10bc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC
index 6e5d3f7..6e5d3f7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index b9cd0ac..b9cd0ac 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index 622d39f..622d39f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 0f478ca..0f478ca 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI
index 64d3eb0..64d3eb0 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL
index aaefdd9..aaefdd9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 6838854..6838854 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 2868f9c..2868f9c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index c8ec23e..c8ec23e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU
index 50dbafd..50dbafd 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index 6c3535b..6c3535b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index 84cded4..84cded4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index 2c032e6..2c032e6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 6b89b38..6b89b38 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index 60c6d30..60c6d30 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index 9fbb7bc..9fbb7bc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index 56a53cb..56a53cb 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index e1114b6..e1114b6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index 69d172c..69d172c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index f8da61b..f8da61b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index 3b8c4a2..3b8c4a2 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index da7d297..da7d297 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 6baccc7..6baccc7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index 45398fa..45398fa 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 6bc931e..6bc931e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 8ec44a0..8ec44a0 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index e2af509..e2af509 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index a55d60f..a55d60f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS
index 5a803f9..5a803f9 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index 28bb82d..28bb82d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index cb6329e..cb6329e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index aefd945..aefd945 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
index e35361f..e35361f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index f012a55..f012a55 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index 060bd91..060bd91 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index e5850c7..e5850c7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index e8dfd31..e8dfd31 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH
index dcf690a..dcf690a 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index ca7c517..ca7c517 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index 17122cc..17122cc 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 48323b5..48323b5 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index e942566..e942566 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM
index 9432784..9432784 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index 549ff61..549ff61 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index 0b4edc7..0b4edc7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index a7260aa..a7260aa 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST
index 265f3af..265f3af 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index 436b979..436b979 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index 50b2362..50b2362 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index 4a6a7b8..4a6a7b8 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ
index c1ed388..c1ed388 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index dc62e4c..dc62e4c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
index b92127f..b92127f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG
index 176b9bf..176b9bf 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index 8b56a1f..8b56a1f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index efce54e..efce54e 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK
index 849f1c7..849f1c7 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 46a855f..46a855f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index cf1c21d..cf1c21d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index 50a7217..50a7217 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index e2cd8de..e2cd8de 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 060cc34..060cc34 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index 945011b..945011b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index 3b53210..3b53210 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index acda89f..acda89f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 5450858..5450858 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA
index 5019f02..5019f02 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index d154f24..d154f24 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 1046ec6..1046ec6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index f9e4805..f9e4805 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index f894a1f..f894a1f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index 42367de..42367de 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 294335d..294335d 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 645c9a5..645c9a5 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index bda87e4..bda87e4 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index 987acec..987acec 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index ad1e62b..ad1e62b 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index 26ecb82..26ecb82 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index 2337ed6..2337ed6 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index 03fa87f..03fa87f 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index be646a1..be646a1 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index e5eb105..e5eb105 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index c742d5c..c742d5c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index dd3dea3..dd3dea3 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 2766b3c..2766b3c 100644
--- a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
index 10f9535..10f9535 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
index 0ef9b91..0ef9b91 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
index 4242118..4242118 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
index 54e9647..54e9647 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
index d3aa3b0..d3aa3b0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index 1d074b7..1d074b7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1201_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1201_en
index bb98273..bb98273 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1201_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1201_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1202_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1202_en
index 306ce02..306ce02 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1202_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1202_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1203_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1203_en
index 93786eb..93786eb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1203_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1203_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1204_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1204_en
index eaad437..eaad437 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1204_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1204_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1205_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1205_en
index 8fb3949..8fb3949 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1205_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1205_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1206_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1206_en
index e5ee177..e5ee177 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1206_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1206_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1207_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1207_en
index 4d720c3..4d720c3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1207_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1207_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1208_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1208_en
index 0c503bf..0c503bf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1208_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1208_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1209_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1209_en
index f55fa82..f55fa82 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1209_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1209_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1210_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1210_en
index 519470d..519470d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1210_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1210_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1212_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1212_en
index d4179c0..d4179c0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1212_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1212_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1213_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1213_en
index e7315eb..e7315eb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1213_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1213_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1214_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1214_en
index 1a736df..1a736df 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1214_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1214_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1215_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1215_en
index 9caefe3..9caefe3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1215_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1215_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1216_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1216_en
index 5305522..5305522 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1216_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1216_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1217_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1217_en
index b6e2606..b6e2606 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1217_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1217_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1218_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
index 52851ba..52851ba 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1219_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
index 5731a17..5731a17 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1224_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
index 5af1238..5af1238 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1225_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
index 32ee0d0..32ee0d0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1226_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
index 7f2d4fa..7f2d4fa 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1228_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1228_en
index 5440111..5440111 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1228_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1228_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1229_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1229_en
index bd6c00f..bd6c00f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1229_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1229_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1231_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1231_en
index 3a137ed..3a137ed 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1231_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1231_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1234_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1234_en
index 14906de..14906de 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1234_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1234_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1239_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1239_en
index ed594ca..ed594ca 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1239_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1239_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1240_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
index 8b054e1..8b054e1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1248_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
index cc14c9e..cc14c9e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1250_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
index 4f1f495..4f1f495 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1251_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
index dd34251..dd34251 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1252_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
index d4243ab..d4243ab 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1253_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1253_en
index ca292d9..ca292d9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1253_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1253_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1254_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1254_en
index 8c090c8..8c090c8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1254_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1254_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1256_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1256_en
index b954f65..b954f65 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1256_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1256_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1260_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1260_en
index 1d112d9..1d112d9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1260_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1260_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1262_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1262_en
index a0ba4c0..a0ba4c0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1262_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1262_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1267_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1267_en
index 3c8fba6..3c8fba6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1267_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1267_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1269_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1269_en
index 7111bf4..7111bf4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1269_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1269_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1270_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
index 81775d7..81775d7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1276_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
index 95d98ab..95d98ab 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1281_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
index 67a497f..67a497f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1289_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
index a44c5b3..a44c5b3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1301_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
index fdec02f..fdec02f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1302_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
index d9578c8..d9578c8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1303_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1303_en
index 2df62e6..2df62e6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1303_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1303_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1304_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1304_en
index 812f34b..812f34b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1304_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1304_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1305_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
index ddc522f..ddc522f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1306_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1306_en
index 35094f0..35094f0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1306_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1306_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1307_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1307_en
index 9a851de..9a851de 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1307_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1307_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1308_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1308_en
index b0545ca..b0545ca 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1308_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1308_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1309_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1309_en
index d5029f8..d5029f8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1309_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1309_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1310_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1310_en
index 8340bba..8340bba 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1310_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1310_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1312_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1312_en
index 9a2fdc6..9a2fdc6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1312_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1312_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1313_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1313_en
index e09f6cd..e09f6cd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1313_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1313_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1314_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1314_en
index 576ac1c..576ac1c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1314_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1314_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1315_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1315_en
index c097de2..c097de2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1315_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1315_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1316_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1316_en
index eae6b38..eae6b38 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1316_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1316_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1317_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1317_en
index e577222..e577222 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1317_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1317_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1318_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1318_en
index 3e48ecc..3e48ecc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1318_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1318_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1319_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1319_en
index f690c73..f690c73 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1319_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1319_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1320_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1320_en
index 6441a1d..6441a1d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1320_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1320_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1321_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1321_en
index a3e406e..a3e406e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1321_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1321_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1323_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1323_en
index 8571ced..8571ced 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1323_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1323_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1325_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
index e3f8595..e3f8595 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1330_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
index a3f3b7e..a3f3b7e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1331_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
index d5f7c6c..d5f7c6c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1334_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
index 2aab6a1..2aab6a1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1336_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
index a873afc..a873afc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1337_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
index 6de57a4..6de57a4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1339_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
index 0c2e42b..0c2e42b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1347_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
index 4b4c5dc..4b4c5dc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1351_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1351_en
index eee213d..eee213d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1351_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1351_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1352_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1352_en
index ec62795..ec62795 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1352_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1352_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1360_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1360_en
index f9a5a8a..f9a5a8a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1360_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1360_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1361_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1361_en
index 5c221a9..5c221a9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1361_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1361_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1385_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1385_en
index 4a4c1bb..4a4c1bb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1385_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1385_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1386_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1386_en
index 45049ba..45049ba 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1386_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1386_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1401_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1401_en
index 7293621..7293621 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1401_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1401_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1402_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1402_en
index d93b8c9..d93b8c9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1402_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1402_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1403_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1403_en
index b606c26..b606c26 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1403_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1403_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1404_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1404_en
index bf273a3..bf273a3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1404_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1404_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1405_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1405_en
index 9722abc..9722abc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1405_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1405_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1406_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1406_en
index 4874675..4874675 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1406_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1406_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1407_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1407_en
index 6acfc6a..6acfc6a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1407_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1407_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1408_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1408_en
index 62ac82a..62ac82a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1408_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1408_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1409_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1409_en
index 15d8a3a..15d8a3a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1409_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1409_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1410_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1410_en
index 2e3c4ac..2e3c4ac 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1410_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1410_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1412_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1412_en
index ed26616..ed26616 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1412_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1412_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1413_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1413_en
index 7cf4cee..7cf4cee 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1413_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1413_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1414_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1414_en
index 717dbd7..717dbd7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1414_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1414_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1415_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1415_en
index 9079586..9079586 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1415_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1415_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1416_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1416_en
index d6e6f96..d6e6f96 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1416_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1416_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1417_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1417_en
index ac551fd..ac551fd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1417_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1417_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1418_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
index 8667894..8667894 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1419_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1419_en
index fb7548b..fb7548b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1419_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1419_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1423_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1423_en
index 9023400..9023400 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1423_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1423_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1424_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1424_en
index bc3b1a5..bc3b1a5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1424_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1424_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1425_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1425_en
index 7d7084e..7d7084e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1425_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1425_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1430_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1430_en
index eb8782d..eb8782d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1430_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1430_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1432_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1432_en
index 9c8a2ca..9c8a2ca 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1432_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1432_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1434_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1434_en
index 82fb900..82fb900 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1434_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1434_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1435_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1435_en
index db6c64f..db6c64f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1435_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1435_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1438_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
index be39869..be39869 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1440_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
index fd860de..fd860de 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1443_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
index bf278f6..bf278f6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1450_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
index 4950cd8..4950cd8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1469_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
index d1caf62..d1caf62 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1478_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
index e5b09f9..e5b09f9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1479_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
index 51ab912..51ab912 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1480_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
index 8c259c0..8c259c0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1484_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1484_en
index 4bc0dfa..4bc0dfa 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1484_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1484_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1501_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1501_en
index 7e118f6..7e118f6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1501_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1501_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1502_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1502_en
index a7a5b99..a7a5b99 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1502_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1502_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1503_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1503_en
index 48d05d4..48d05d4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1503_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1503_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1504_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1504_en
index 49c0b85..49c0b85 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1504_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1504_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1505_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1505_en
index c4eb180..c4eb180 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1505_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1505_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1506_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1506_en
index 6a7b473..6a7b473 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1506_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1506_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1507_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1507_en
index dc76325..dc76325 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1507_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1507_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1508_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1508_en
index 3e9ce41..3e9ce41 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1508_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1508_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1509_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1509_en
index 12fbdc6..12fbdc6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1509_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1509_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1510_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1510_en
index b342c22..b342c22 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1510_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1510_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1512_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1512_en
index 63b9995..63b9995 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1512_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1512_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1513_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1513_en
index 338c8f1..338c8f1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1513_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1513_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1514_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
index 8f5d124..8f5d124 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1515_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1515_en
index fada095..fada095 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1515_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1515_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1516_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1516_en
index 39e0138..39e0138 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1516_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1516_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1517_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1517_en
index f017efc..f017efc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1517_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1517_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1518_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1518_en
index d57a9e0..d57a9e0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1518_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1518_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1519_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
index 184ffbf..184ffbf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1520_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
index 1930d45..1930d45 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1530_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
index 0ba769f..0ba769f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1540_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
index 2056d8f..2056d8f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1541_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
index def6616..def6616 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1551_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
index e36fbbc..e36fbbc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1559_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
index a798388..a798388 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1561_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
index a5c4d8e..a5c4d8e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1562_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
index ae32a56..ae32a56 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1563_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
index 1a6094f..1a6094f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1567_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
index 4c005b5..4c005b5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1570_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
index c8491c1..c8491c1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1571_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
index bd6dc00..bd6dc00 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1573_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
index e952524..e952524 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1574_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
index 2eb7589..2eb7589 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1575_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
index 5a8f792..5a8f792 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1580_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
index fe11647..fe11647 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1585_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
index f55ba0f..f55ba0f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1586_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
index 721c4d0..721c4d0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1587_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
index 71f8a24..71f8a24 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1601_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1601_en
index 45e0d3c..45e0d3c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1601_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1601_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1602_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1602_en
index b1d2266..b1d2266 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1602_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1602_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1603_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1603_en
index dc28c76..dc28c76 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1603_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1603_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1604_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1604_en
index 6175abd..6175abd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1604_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1604_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1605_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1605_en
index 6f80f31..6f80f31 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1605_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1605_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1606_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1606_en
index 30810b4..30810b4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1606_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1606_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1607_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1607_en
index 70c77da..70c77da 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1607_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1607_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1608_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1608_en
index e29fcc2..e29fcc2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1608_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1608_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1609_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1609_en
index 8819bb4..8819bb4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1609_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1609_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1610_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1610_en
index ad86252..ad86252 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1610_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1610_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1612_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1612_en
index 2fb4156..2fb4156 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1612_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1612_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1613_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1613_en
index e1df260..e1df260 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1613_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1613_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1614_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1614_en
index f9d0201..f9d0201 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1614_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1614_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1615_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1615_en
index 5347dff..5347dff 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1615_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1615_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1616_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1616_en
index b6bef4d..b6bef4d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1616_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1616_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1617_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1617_en
index 6d47691..6d47691 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1617_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1617_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1618_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1618_en
index 074da52..074da52 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1618_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1618_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1619_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1619_en
index 5781415..5781415 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1619_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1619_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1620_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1620_en
index 1428f52..1428f52 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1620_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1620_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1623_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1623_en
index fa04f3a..fa04f3a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1623_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1623_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1626_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1626_en
index 8243d25..8243d25 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1626_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1626_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1630_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1630_en
index a545ba1..a545ba1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1630_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1630_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1631_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
index a3e4b30..a3e4b30 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1636_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
index c6e31ce..c6e31ce 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1641_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
index 09d37ff..09d37ff 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1646_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
index 7029025..7029025 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1647_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
index c000f64..c000f64 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1650_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1650_en
index 349fdcf..349fdcf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1650_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1650_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1651_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1651_en
index edd6f90..edd6f90 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1651_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1651_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1657_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1657_en
index dd7858f..dd7858f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1657_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1657_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1660_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1660_en
index 84167e8..84167e8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1660_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1660_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1661_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1661_en
index 163197a..163197a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1661_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1661_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1662_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1662_en
index 89104de..89104de 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1662_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1662_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1678_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
index 287de14..287de14 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1682_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
index f70ae44..f70ae44 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1701_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
index 402f3c2..402f3c2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1702_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
index b5cb753..b5cb753 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1703_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1703_en
index 3196a8e..3196a8e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1703_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1703_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1704_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1704_en
index 65928c3..65928c3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1704_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1704_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1705_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1705_en
index 441b558..441b558 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1705_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1705_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1706_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1706_en
index 988df79..988df79 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1706_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1706_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1707_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1707_en
index 37194ec..37194ec 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1707_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1707_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1708_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1708_en
index b68c3aa..b68c3aa 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1708_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1708_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1709_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1709_en
index 1047732..1047732 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1709_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1709_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1712_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1712_en
index 92a81f1..92a81f1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1712_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1712_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1713_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1713_en
index 5ca9b5e..5ca9b5e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1713_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1713_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1714_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1714_en
index ffc4f85..ffc4f85 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1714_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1714_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1715_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1715_en
index 0079c6b..0079c6b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1715_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1715_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1716_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1716_en
index b393523..b393523 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1716_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1716_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1717_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1717_en
index 876a808..876a808 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1717_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1717_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1718_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1718_en
index 4a16abb..4a16abb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1718_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1718_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1719_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1719_en
index dc6d6a7..dc6d6a7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1719_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1719_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1720_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
index aa2deb2..aa2deb2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1724_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
index b95249e..b95249e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1726_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
index cb81e2d..cb81e2d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1727_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
index f59ce52..f59ce52 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1730_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1730_en
index a2db58d..a2db58d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1730_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1730_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1731_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
index e041cac..e041cac 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1732_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
index 244a2c9..244a2c9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1734_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
index 06f2135..06f2135 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1740_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
index 7ed9506..7ed9506 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1754_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
index 701f6a8..701f6a8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1757_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
index 97714b5..97714b5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1760_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
index 40854a6..40854a6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1763_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
index 971e1ac..971e1ac 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1765_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
index 1e87dcc..1e87dcc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1769_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
index 7f5616a..7f5616a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1770_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1770_en
index 01bc96d..01bc96d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1770_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1770_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1772_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1772_en
index 3e6641b..3e6641b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1772_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1772_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1773_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1773_en
index 3b5cb28..3b5cb28 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1773_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1773_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1774_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1774_en
index 47fe94a..47fe94a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1774_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1774_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1775_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1775_en
index 879e514..879e514 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1775_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1775_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1778_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1778_en
index c6b9c96..c6b9c96 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1778_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1778_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1779_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1779_en
index fac0886..fac0886 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1779_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1779_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1780_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1780_en
index fdeddcc..fdeddcc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1780_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1780_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1781_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1781_en
index ea2f926..ea2f926 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1781_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1781_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1785_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1785_en
index 0ca48dd..0ca48dd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1785_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1785_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1786_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1786_en
index 612dd69..612dd69 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1786_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1786_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1801_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1801_en
index c93ac1a..c93ac1a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1801_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1801_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1802_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1802_en
index 8fd7eb6..8fd7eb6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1802_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1802_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1803_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1803_en
index 0732fbb..0732fbb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1803_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1803_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1804_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1804_en
index 6f70d2c..6f70d2c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1804_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1804_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1805_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1805_en
index 47c5bf3..47c5bf3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1805_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1805_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1806_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1806_en
index 4674327..4674327 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1806_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1806_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1807_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1807_en
index 86fde6d..86fde6d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1807_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1807_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1808_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1808_en
index b810cfb..b810cfb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1808_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1808_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1810_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1810_en
index c1e3af7..c1e3af7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1810_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1810_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1812_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1812_en
index 0ba83df..0ba83df 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1812_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1812_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1813_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1813_en
index 7fb187f..7fb187f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1813_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1813_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1814_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1814_en
index 2c05f2f..2c05f2f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1814_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1814_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1815_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1815_en
index a80e7e8..a80e7e8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1815_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1815_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1816_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1816_en
index fbfc566..fbfc566 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1816_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1816_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1817_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
index 22f36cc..22f36cc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1818_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
index 78cef0c..78cef0c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1819_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
index 42ab96a..42ab96a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1828_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
index a83f8fc..a83f8fc 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1830_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
index b9dd2bb..b9dd2bb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1831_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
index 2706c69..2706c69 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1832_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
index 77a8d42..77a8d42 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1838_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
index ff902ce..ff902ce 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1843_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
index ec90963..ec90963 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1845_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
index 7ad004c..7ad004c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1847_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
index 0531619..0531619 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1848_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
index ca5aca7..ca5aca7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1850_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
index 4157758..4157758 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1851_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
index 8523ef3..8523ef3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1856_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
index d5ce6b3..d5ce6b3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1857_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
index 853bf5f..853bf5f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1858_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
index d036af8..d036af8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1859_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1859_en
index 82eae89..82eae89 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1859_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1859_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1860_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1860_en
index 24f9897..24f9897 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1860_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1860_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1862_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1862_en
index 8442816..8442816 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1862_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1862_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1863_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1863_en
index 37b26a9..37b26a9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1863_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1863_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1864_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1864_en
index 99aa6db..99aa6db 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1864_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1864_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1865_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1865_en
index 2fa95f3..2fa95f3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1865_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1865_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
index e390fa5..e390fa5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1870_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1870_en
index 626fe8e..626fe8e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1870_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1870_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1872_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1872_en
index e851d4b..e851d4b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1872_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1872_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1878_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1878_en
index 676f678..676f678 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1878_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1878_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1888_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1888_en
index 47068cb..47068cb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1888_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1888_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1901_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1901_en
index d54c8b4..d54c8b4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1901_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1901_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1902_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
index 89897a9..89897a9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1903_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1903_en
index 86d1f70..86d1f70 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1903_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1903_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1904_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1904_en
index ad534ce..ad534ce 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1904_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1904_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1905_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1905_en
index a445998..a445998 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1905_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1905_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1906_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1906_en
index 2919ad0..2919ad0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1906_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1906_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1907_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1907_en
index 04c63e2..04c63e2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1907_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1907_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1908_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1908_en
index 99c0e32..99c0e32 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1908_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1908_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1909_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1909_en
index 457e115..457e115 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1909_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1909_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1910_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1910_en
index 11e93fe..11e93fe 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1910_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1910_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1912_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1912_en
index 30ec7de..30ec7de 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1912_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1912_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1913_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1913_en
index 0272f76..0272f76 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1913_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1913_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1914_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1914_en
index e19a7bf..e19a7bf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1914_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1914_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1915_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1915_en
index 6adc9ae..6adc9ae 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1915_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1915_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1916_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1916_en
index 766cf63..766cf63 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1916_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1916_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1917_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1917_en
index 72c9476..72c9476 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1917_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1917_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1918_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1918_en
index 034ceea..034ceea 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1918_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1918_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1919_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1919_en
index 66b5a93..66b5a93 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1919_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1919_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1920_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1920_en
index 5e75d99..5e75d99 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1920_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1920_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1925_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1925_en
index defa317..defa317 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1925_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1925_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1928_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1928_en
index cc06485..cc06485 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1928_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1928_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1931_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
index 2cbd816..2cbd816 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1936_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
index c8bdcff..c8bdcff 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1937_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
index 2698438..2698438 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1940_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1940_en
index a100c66..a100c66 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1940_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1940_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1941_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1941_en
index 30f5f87..30f5f87 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1941_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1941_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1947_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1947_en
index 314dd69..314dd69 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1947_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1947_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1949_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1949_en
index 8dd0dd5..8dd0dd5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1949_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1949_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1951_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1951_en
index 9812455..9812455 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1951_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1951_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1952_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1952_en
index 86ddc13..86ddc13 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1952_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1952_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1954_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1954_en
index 1f79669..1f79669 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1954_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1954_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1956_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1956_en
index cfe7888..cfe7888 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1956_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1956_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1970_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1970_en
index 4a9fd6c..4a9fd6c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1970_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1970_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1971_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1971_en
index 053acd0..053acd0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1971_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1971_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1972_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1972_en
index 3335253..3335253 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1972_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1972_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1973_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1973_en
index d682cc7..d682cc7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1973_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1973_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1978_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1978_en
index 8f02daf..8f02daf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1978_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1978_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1979_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1979_en
index 9d9d449..9d9d449 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1979_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1979_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1980_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
index f1d82a3..f1d82a3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1985_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
index 73336d9..73336d9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/1989_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
index 42db96d..42db96d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/20_en
index 76b227e..76b227e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/20_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_en
index ad7f944..ad7f944 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
index 9016b0d..9016b0d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/213_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/213_en
index 7a1379c..7a1379c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/213_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/213_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/216_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/216_en
index 9af2d13..9af2d13 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/216_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/216_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/220_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/220_en
index 29941e6..29941e6 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/220_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/220_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/221_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/221_en
index b876d30..b876d30 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/221_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/221_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_en
index 7b4ec36..7b4ec36 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
index ceb0870..ceb0870 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/224_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/224_en
index e63507d..e63507d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/224_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/224_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_en
index e290e50..e290e50 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_fr
index e290e50..e290e50 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/225_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/225_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/226_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/226_en
index ed31886..ed31886 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/226_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/226_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_en
index 192a5d7..192a5d7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_es
index 7c124ef..7c124ef 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
index 884ca42..884ca42 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_en
index 21b5b82..21b5b82 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_fr
index 6002a86..6002a86 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/229_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/229_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_en
index 3cf3259..3cf3259 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_es
index 49f2050..49f2050 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
index bf51072..bf51072 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/232_en
index 9cb3996..9cb3996 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/232_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/233_en
index aca1927..aca1927 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/233_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/233_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_en
index 092d85a..092d85a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_pt
index 092d85a..092d85a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/238_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/238_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_en
index 37a5e89..37a5e89 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
index 8610e0a..8610e0a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_en
index 86c316f..86c316f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
index 2ad2a1a..2ad2a1a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_en
index 14b51a0..14b51a0 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_fr
index ac48d42..ac48d42 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/243_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/243_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_en
index 59c00b9..59c00b9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_pt
index 34cf12b..34cf12b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/244_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/244_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_en
index 2738fe8..2738fe8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_pt
index 2738fe8..2738fe8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/245_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/245_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/247_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/247_en
index 259944a..259944a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/247_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/247_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/249_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/249_en
index d605df8..d605df8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/249_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/249_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/251_en
index e389d1c..e389d1c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/251_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/252_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/252_en
index 241ed68..241ed68 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/252_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/252_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/254_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/254_en
index b21858b..b21858b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/254_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/254_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/256_en
index 6043317..6043317 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/256_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_en
index 6f11df7..6f11df7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_pt
index 18ddf2e..18ddf2e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/258_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/258_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/260_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/260_en
index b469b16..b469b16 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/260_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/260_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/261_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/261_en
index af8affb..af8affb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/261_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/261_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/263_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/263_en
index 7ec8339..7ec8339 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/263_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/263_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/264_en
index ef92fe5..ef92fe5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/264_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/264_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/266_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/266_en
index 3fc9c6f..3fc9c6f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/266_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/266_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/267_en
index 4c52bd2..4c52bd2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/267_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/267_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/268_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/268_en
index 16067ff..16067ff 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/268_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/268_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_en
index bbc053b..bbc053b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
index bbc053b..bbc053b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/27_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/27_en
index c86a27c..c86a27c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/27_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/27_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_en
index b65865d..b65865d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
index a9df787..a9df787 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/299_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/299_en
index 2e0fee5..2e0fee5 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/299_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/299_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_el b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_el
index 3ae0b10..3ae0b10 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_el
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_el
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_en
index 8211506..8211506 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/30_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/30_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_en
index 7565cac..7565cac 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_nl b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_nl
index 78768ba..78768ba 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/31_nl
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/31_nl
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_en
index 7e9655f..7e9655f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
index 85f2c6b..85f2c6b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_en
index 3ec6b10..3ec6b10 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_es
index 749b162..749b162 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/34_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/34_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_en
index 61f0da1..61f0da1 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_pt
index eb08045..eb08045 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/351_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/351_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_de
index d20ebca..d20ebca 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_de
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_de
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_en
index e510e7b..e510e7b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/352_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/352_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/354_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/354_en
index 2e85aa2..2e85aa2 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/354_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/354_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/355_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/355_en
index b903bcd..b903bcd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/355_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/355_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_en
index 3e9c6c3..3e9c6c3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_fi b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
index 3824cfb..3824cfb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_se b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_se
index 3c49760..3c49760 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/358_se
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/358_se
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_en
index d9f2a71..d9f2a71 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_hu b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_hu
index 6eaf151..6eaf151 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/36_hu
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/36_hu
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/370_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/370_en
index 52b47bd..52b47bd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/370_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/370_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/371_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/371_en
index 5273f0e..5273f0e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/371_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/371_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/372_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/372_en
index aaaa338..aaaa338 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/372_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/372_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_en
index 9ef1b6e..9ef1b6e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ro b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
index 3ef4931..3ef4931 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ru b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
index b643821..b643821 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/374_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/374_en
index 8bdf764..8bdf764 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/374_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/374_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_en
index 8cde57a..8cde57a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_sr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
index 2a5deaa..2a5deaa 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_en
index fada2f3..fada2f3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_it b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_it
index db32682..db32682 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/39_it
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/39_it
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_de
index e62c797..e62c797 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_de
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_de
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_en
index 79ab086..79ab086 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_fr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_fr
index 6fb2df8..6fb2df8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_fr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_fr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_it b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_it
index 9cc1e5b..9cc1e5b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/41_it
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/41_it
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/420_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/420_en
index 6e39c43..6e39c43 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/420_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/420_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/421_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/421_en
index 5a5dc09..5a5dc09 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/421_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/421_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_de
index 5687e97..5687e97 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_de
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_de
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_en
index 050418d..050418d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/43_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/43_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/44_en
index 3a2d306..3a2d306 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/44_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/44_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_en
index 934bb3e..934bb3e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_sv b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
index 31a27a8..31a27a8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_en
index 969da0c..969da0c 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_pl b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
index cd5eb5a..cd5eb5a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_de b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_de
index 428b8bf..428b8bf 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_de
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_de
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_en
index 40b3748..40b3748 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/49_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/49_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/51_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/51_en
index 7f84d3e..7f84d3e 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/51_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/51_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/53_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/53_en
index 5d15867..5d15867 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/53_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/53_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_en
index ae2fbdd..ae2fbdd 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_es
index afd958b..afd958b 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/54_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/54_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_en
index 753576a..753576a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
index 753576a..753576a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_en
index 9126f78..9126f78 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_es
index 9126f78..9126f78 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/56_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/56_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_en
index 9c7a787..9c7a787 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_es b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_es
index 8407816..8407816 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/58_es
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/58_es
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/7_en
index 7ac3c1d..7ac3c1d 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/7_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/7_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_en
index f9d096f..f9d096f 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_ja b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
index 7cc7384..7cc7384 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_en
index cd18ecb..cd18ecb 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_ko b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
index cbc3017..cbc3017 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
index d452ab7..d452ab7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
index a6a9452..a6a9452 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_en
index 5221729..5221729 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_vi b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
index 1b0e2d7..1b0e2d7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_en
index b5b21b7..b5b21b7 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
index bbd7660..bbd7660 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_en
index 497c293..497c293 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
index d04e3ab..d04e3ab 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
index eb259e9..eb259e9 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_en
index a3dfd81..a3dfd81 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_tr b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
index cfcf99a..cfcf99a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/94_en b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/94_en
index 0794d2a..0794d2a 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/94_en
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/94_en
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/config
index c7db9c8..c7db9c8 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/geocoding/data/config
diff --git a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 64171ac..64171ac 100644
--- a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
index 6d7417d..6d7417d 100644
--- a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
diff --git a/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
index 7c30588..7c30588 100644
--- a/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
index 899fc94..899fc94 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
index c23181d..c23181d 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index e7038c6..e7038c6 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhonenumberTest.java
index 466a0e3..466a0e3 100644
--- a/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhonenumberTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegexCacheTest.java
index a2839d3..a2839d3 100644
--- a/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegexCacheTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/RegionCode.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java
index 36e44e5..36e44e5 100644
--- a/java/test/com/google/i18n/phonenumbers/RegionCode.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java
diff --git a/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
index 20644d2..20644d2 100644
--- a/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig
new file mode 100644
index 0000000..b1ae29b
--- /dev/null
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java.orig
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2011 The Libphonenumber Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.i18n.phonenumbers;
+
+import junit.framework.TestCase;
+
+import java.io.InputStream;
+
+/**
+ * @author Shaopeng Jia
+ */
+public class ShortNumberUtilTest extends TestCase {
+  private ShortNumberUtil shortUtil;
+  static final String TEST_META_DATA_FILE_PREFIX =
+      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
+
+  public ShortNumberUtilTest() {
+    PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(
+        TEST_META_DATA_FILE_PREFIX,
+        CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap());
+    shortUtil = new ShortNumberUtil(phoneUtil);
+  }
+
+  public void testConnectsToEmergencyNumber_US() {
+    assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.US));
+    assertTrue(shortUtil.connectsToEmergencyNumber("119", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.US));
+  }
+
+  public void testConnectsToEmergencyNumberLongNumber_US() {
+    assertTrue(shortUtil.connectsToEmergencyNumber("9116666666", RegionCode.US));
+    assertTrue(shortUtil.connectsToEmergencyNumber("1196666666", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("9996666666", RegionCode.US));
+  }
+
+  public void testConnectsToEmergencyNumberWithFormatting_US() {
+    assertTrue(shortUtil.connectsToEmergencyNumber("9-1-1", RegionCode.US));
+    assertTrue(shortUtil.connectsToEmergencyNumber("1-1-9", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("9-9-9", RegionCode.US));
+  }
+
+  public void testConnectsToEmergencyNumberWithPlusSign_US() {
+    assertFalse(shortUtil.connectsToEmergencyNumber("+911", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("\uFF0B911", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber(" +911", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("+119", RegionCode.US));
+    assertFalse(shortUtil.connectsToEmergencyNumber("+999", RegionCode.US));
+  }
+
+  public void testConnectsToEmergencyNumber_BR() {
+    assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.BR));
+    assertTrue(shortUtil.connectsToEmergencyNumber("190", RegionCode.BR));
+    assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.BR));
+  }
+
+  public void testConnectsToEmergencyNumberLongNumber_BR() {
+    // Brazilian emergency numbers don't work when additional digits are appended.
+    assertFalse(shortUtil.connectsToEmergencyNumber("9111", RegionCode.BR));
+    assertFalse(shortUtil.connectsToEmergencyNumber("1900", RegionCode.BR));
+    assertFalse(shortUtil.connectsToEmergencyNumber("9996", RegionCode.BR));
+  }
+}
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD
index 8dba7fa..8dba7fa 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO
index 44b042e..44b042e 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR
index 549bc8b..549bc8b 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU
index b3ee483..b3ee483 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR
index fc33520..fc33520 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS
index 7ec5aa3..7ec5aa3 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE
index 42d58fe..42d58fe 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB
index 171bbc0..171bbc0 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT
index be4d9c1..be4d9c1 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP
index 1dbb2b1..1dbb2b1 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR
index 21c764e..21c764e 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
index 854f020..854f020 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
index d3b27a6..d3b27a6 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
index 9b082df..9b082df 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
index 02b38fa..02b38fa 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
index c5df8dc..c5df8dc 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
index cf65f6a..cf65f6a 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
index ecee4a4..ecee4a4 100644
--- a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
index 84ec90d..84ec90d 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java
index 3db1264..3db1264 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorageTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
index c426189..c426189 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
index e8488e4..e8488e4 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
index 2a516e0..2a516e0 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en
index 9af68fa..9af68fa 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en
index 0c3d5d8..0c3d5d8 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en
index b4f7c1d..b4f7c1d 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de
index 1fa2f0f..1fa2f0f 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en
index a95364e..a95364e 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en
index 40d8716..40d8716 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en
index cd18ecb..cd18ecb 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
index dfa91c3..dfa91c3 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/config b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/config
index aab8c13..aab8c13 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/testing_data/config
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/geocoding/testing_data/config