Merge "Update libphonenumber to 8.13.27" into main am: f59dbf7804

Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/2882990

Change-Id: Ic85d1ca4fcb53633e3d84f16ece3e8dc8135d6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

50 files changed, 25 insertions, 29 deletions

diff --git a/README.version b/README.version
index 501da2c5..9706a03f 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
 URL: https://github.com/googlei18n/libphonenumber/
-Version: 8.13.26
+Version: 8.13.27
 BugComponent: 20868
diff --git a/carrier/pom.xml b/carrier/pom.xml
index 24f1d7e3..7bc81450 100644
--- a/carrier/pom.xml
+++ b/carrier/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.210</version>
+  <version>1.211</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.26</version>
+    <version>8.13.27</version>
   </parent>
 
   <build>
@@ -79,12 +79,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.26</version>
+      <version>8.13.27</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.220</version>
+      <version>2.221</version>
     </dependency>
   </dependencies>
 
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
index 01460ed7..188dd5f6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
index 24f1123d..c1ab7ec2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
index 35a67062..78c2b3c5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
index 782afc3a..f0dd6683 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
index 9edf3f72..9eb7589c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
index 48155be9..56401b84 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
index 7f184305..a9393d6c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
index 9d1e3c5c..9a6ba10a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
index 81bcaa2f..ca92ceef 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
index 5f30fc3b..7eff0daf 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
index d2d3b38a..5366ae42 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
diff --git a/demo/pom.xml b/demo/pom.xml
index d5f4da4a..76f64cdc 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.13.26</version>
+  <version>8.13.27</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.26</version>
+    <version>8.13.27</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.26</version>
+      <version>8.13.27</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.220</version>
+      <version>2.221</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.210</version>
+      <version>1.211</version>
     </dependency>
   </dependencies>
 
diff --git a/geocoder/pom.xml b/geocoder/pom.xml
index f4295a99..aa4439af 100644
--- a/geocoder/pom.xml
+++ b/geocoder/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.220</version>
+  <version>2.221</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.26</version>
+    <version>8.13.27</version>
   </parent>
 
   <build>
@@ -87,12 +87,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.26</version>
+      <version>8.13.27</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.220</version>
+      <version>2.221</version>
     </dependency>
   </dependencies>
 
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
index 5c5dbae5..aaf87b62 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
index ce66f378..67e998fb 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
index a277f96d..ebb6ba97 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
index 14a00bbb..4d1a105e 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml
index 8436c410..eaafd94a 100644
--- a/internal/prefixmapper/pom.xml
+++ b/internal/prefixmapper/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.220</version>
+  <version>2.221</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.26</version>
+    <version>8.13.27</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.26</version>
+      <version>8.13.27</version>
     </dependency>
   </dependencies>
 
diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml
index d6c0d1e3..d61cfcb7 100644
--- a/libphonenumber/pom.xml
+++ b/libphonenumber/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>8.13.26</version>
+  <version>8.13.27</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.26</version>
+    <version>8.13.27</version>
   </parent>
 
   <build>
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 1f49d674..c49189fa 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -1275,14 +1275,12 @@ public class PhoneNumberUtil {
    * @return  the formatted phone number
    */
   public String format(PhoneNumber number, PhoneNumberFormat numberFormat) {
-    if (number.getNationalNumber() == 0 && number.hasRawInput()) {
+    if (number.getNationalNumber() == 0) {
       // Unparseable numbers that kept their raw input just use that.
       // This is the only case where a number can be formatted as E164 without a
       // leading '+' symbol (but the original number wasn't parseable anyway).
-      // TODO: Consider removing the 'if' above so that unparseable
-      // strings without raw input format to the empty string instead of "+00".
       String rawInput = number.getRawInput();
-      if (rawInput.length() > 0) {
+      if (rawInput.length() > 0 || !number.hasCountryCode()) {
         return rawInput;
       }
     }
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index b9e21d9b..0d511c7b 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 7c8d0668..0483e11c 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index 1daca045..6701ed48 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 904c71b3..46353126 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 8b7ea71a..1497e868 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 10e027f3..982962b4 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 12a0cf62..50e48c94 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 385ab34d..f091d94e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index 8e52f3a2..20325287 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index b8c38e5b..629a176e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 2c81f4c2..24395493 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
diff --git a/pom.xml b/pom.xml
index d1ad15d7..b9b2d9ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>8.13.26</version>
+  <version>8.13.27</version>
   <packaging>pom</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
@@ -34,7 +34,7 @@
     <connection>scm:git:https://github.com/google/libphonenumber.git</connection>
     <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection>
     <url>https://github.com/google/libphonenumber/</url>
-    <tag>v8.13.26</tag>
+    <tag>v8.13.27</tag>
   </scm>
 
   <properties>
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_en
index 5c5dbae5..aaf87b62 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_sv b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_sv
index ce66f378..67e998fb 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_sv
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/358_sv
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
index a277f96d..ebb6ba97 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
index 14a00bbb..4d1a105e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 402562c8..5bdbcb29 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -1310,14 +1310,12 @@ public class PhoneNumberUtil {
    */
   @android.compat.annotation.UnsupportedAppUsage
   public String format(PhoneNumber number, PhoneNumberFormat numberFormat) {
-    if (number.getNationalNumber() == 0 && number.hasRawInput()) {
+    if (number.getNationalNumber() == 0) {
       // Unparseable numbers that kept their raw input just use that.
       // This is the only case where a number can be formatted as E164 without a
       // leading '+' symbol (but the original number wasn't parseable anyway).
-      // TODO: Consider removing the 'if' above so that unparseable
-      // strings without raw input format to the empty string instead of "+00".
       String rawInput = number.getRawInput();
-      if (rawInput.length() > 0) {
+      if (rawInput.length() > 0 || !number.hasCountryCode()) {
         return rawInput;
       }
     }
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index b9e21d9b..0d511c7b 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 7c8d0668..0483e11c 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index 1daca045..6701ed48 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 904c71b3..46353126 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 8b7ea71a..1497e868 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 10e027f3..982962b4 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index 12a0cf62..50e48c94 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 385ab34d..f091d94e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index 8e52f3a2..20325287 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index b8c38e5b..629a176e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 2c81f4c2..24395493 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US