diff --git a/README.android b/README.android
index 67485b0..62099c5 100644
--- a/README.android
+++ b/README.android
@@ -1,5 +1,5 @@
 URL: http://code.google.com/p/libphonenumber/
-Version: 4.7 (r436)
+Version: 4.8 (r444)
 License: Apache 2
 Description: Google Phone Number Library.
 Local Modification:
diff --git a/java/release_notes.txt b/java/release_notes.txt
index ecfdd28..87b6c09 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,11 +1,23 @@
+April 24th, 2012: libphonenumber-4.8
+* Functionality changes
+ - RFC format now outputs a number starting with "tel:"
+ - Parsing support for numbers in RFC format that contain the country info in the "phone-context"
+   part
+ - Support for obtaining area codes for Italy, Vatican City, San Marino
+* Metadata changes
+ - AM, AO, AR, BE, BF, CD, EG, GH, GM, GN, IN, IR, IT, JO, LA, LC, MD, MS, NO, PA, PK, SI, SJ, SO,
+   SY, TC, TN, UZ, VN, ZW
+ - Geocoding updates for country calling codes 1, 20, 233, 31, 33, 352, 374, 54, 56, 86
+* Refactoring of matching functions, including moving them to PhoneNumberMatcher.
+
 March 16th, 2012: libphonenumber-4.7
 * Bug fixes
  - Now return "too long" for input that is longer than 250 chars when parsing
 * Metadata changes
  - AC,AM,AT,AZ,BF,BR,BY,BZ,CR,CU,DE,DJ,EE,EG,ET,GA,GH,HK,HN,ID,IN,JP,KE,KG,KH,KR,KW,KY,LB,LU,MA,MD,
    MK,NA,NE,NZ,SA,SB,SC,SE,SL,SN,UZ
- * Refactoring of test classes so that tests requiring the test metadata to be loaded have a common
-   base class which handles this.
+* Refactoring of test classes so that tests requiring the test metadata to be loaded have a common
+  base class which handles this.
 
 February 9th, 2012: libphonenumber-4.6
 * Bug fixes
diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
index 64eaf1b..911433e 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -17,6 +17,11 @@
 package com.android.i18n.phonenumbers;
 
 import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.NumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
 import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
 
 import java.lang.Character.UnicodeBlock;
@@ -214,32 +219,6 @@
     this.maxTries = maxTries;
   }
 
-  public boolean hasNext() {
-    if (state == State.NOT_READY) {
-      lastMatch = find(searchIndex);
-      if (lastMatch == null) {
-        state = State.DONE;
-      } else {
-        searchIndex = lastMatch.end();
-        state = State.READY;
-      }
-    }
-    return state == State.READY;
-  }
-
-  public PhoneNumberMatch next() {
-    // Check the state and find the next match as a side-effect if necessary.
-    if (!hasNext()) {
-      throw new NoSuchElementException();
-    }
-
-    // Don't retain that memory any longer than necessary.
-    PhoneNumberMatch result = lastMatch;
-    lastMatch = null;
-    state = State.NOT_READY;
-    return result;
-  }
-
   /**
    * Attempts to find the next subsequence in the searched sequence on or after {@code searchIndex}
    * that represents a phone number. Returns the next match, null if none was found.
@@ -453,6 +432,236 @@
   }
 
   /**
+   * Small helper interface such that the number groups can be checked according to different
+   * criteria.
+   */
+  interface NumberGroupingChecker {
+    /**
+     * Returns true if the groups of digits found in our candidate phone number match our
+     * expectations.
+     *
+     * @param number  the original number we found when parsing
+     * @param normalizedCandidate  the candidate number, normalized to only contain ASCII digits,
+     *     but with non-digits (spaces etc) retained
+     * @param expectedNumberGroups  the groups of digits that we would expect to see if we
+     *     formatted this number
+     */
+    boolean checkGroups(PhoneNumberUtil util, PhoneNumber number,
+                        StringBuilder normalizedCandidate, String[] expectedNumberGroups);
+  }
+
+  static boolean allNumberGroupsRemainGrouped(PhoneNumberUtil util,
+                                              PhoneNumber number,
+                                              StringBuilder normalizedCandidate,
+                                              String[] formattedNumberGroups) {
+    int fromIndex = 0;
+    // Check each group of consecutive digits are not broken into separate groupings in the
+    // {@code normalizedCandidate} string.
+    for (int i = 0; i < formattedNumberGroups.length; i++) {
+      // Fails if the substring of {@code normalizedCandidate} starting from {@code fromIndex}
+      // doesn't contain the consecutive digits in formattedNumberGroups[i].
+      fromIndex = normalizedCandidate.indexOf(formattedNumberGroups[i], fromIndex);
+      if (fromIndex < 0) {
+        return false;
+      }
+      // Moves {@code fromIndex} forward.
+      fromIndex += formattedNumberGroups[i].length();
+      if (i == 0 && fromIndex < normalizedCandidate.length()) {
+        // We are at the position right after the NDC.
+        if (Character.isDigit(normalizedCandidate.charAt(fromIndex))) {
+          // This means there is no formatting symbol after the NDC. In this case, we only
+          // accept the number if there is no formatting symbol at all in the number, except
+          // for extensions.
+          String nationalSignificantNumber = util.getNationalSignificantNumber(number);
+          return normalizedCandidate.substring(fromIndex - formattedNumberGroups[i].length())
+              .startsWith(nationalSignificantNumber);
+        }
+      }
+    }
+    // The check here makes sure that we haven't mistakenly already used the extension to
+    // match the last group of the subscriber number. Note the extension cannot have
+    // formatting in-between digits.
+    return normalizedCandidate.substring(fromIndex).contains(number.getExtension());
+  }
+
+  static boolean allNumberGroupsAreExactlyPresent(PhoneNumberUtil util,
+                                                  PhoneNumber number,
+                                                  StringBuilder normalizedCandidate,
+                                                  String[] formattedNumberGroups) {
+    String[] candidateGroups =
+        PhoneNumberUtil.NON_DIGITS_PATTERN.split(normalizedCandidate.toString());
+    // Set this to the last group, skipping it if the number has an extension.
+    int candidateNumberGroupIndex =
+        number.hasExtension() ? candidateGroups.length - 2 : candidateGroups.length - 1;
+    // First we check if the national significant number is formatted as a block.
+    // We use contains and not equals, since the national significant number may be present with
+    // a prefix such as a national number prefix, or the country code itself.
+    if (candidateGroups.length == 1 ||
+        candidateGroups[candidateNumberGroupIndex].contains(
+            util.getNationalSignificantNumber(number))) {
+      return true;
+    }
+    // Starting from the end, go through in reverse, excluding the first group, and check the
+    // candidate and number groups are the same.
+    for (int formattedNumberGroupIndex = (formattedNumberGroups.length - 1);
+         formattedNumberGroupIndex > 0 && candidateNumberGroupIndex >= 0;
+         formattedNumberGroupIndex--, candidateNumberGroupIndex--) {
+      if (!candidateGroups[candidateNumberGroupIndex].equals(
+          formattedNumberGroups[formattedNumberGroupIndex])) {
+        return false;
+      }
+    }
+    // Now check the first group. There may be a national prefix at the start, so we only check
+    // that the candidate group ends with the formatted number group.
+    return (candidateNumberGroupIndex >= 0 &&
+            candidateGroups[candidateNumberGroupIndex].endsWith(formattedNumberGroups[0]));
+  }
+
+  /**
+   * Helper method to get the national-number part of a number, formatted without any national
+   * prefix, and return it as a set of digit blocks that would be formatted together.
+   */
+  private static String[] getNationalNumberGroups(PhoneNumberUtil util, PhoneNumber number,
+                                                  NumberFormat formattingPattern) {
+    if (formattingPattern == null) {
+      // This will be in the format +CC-DG;ext=EXT where DG represents groups of digits.
+      String rfc3966Format = util.format(number, PhoneNumberFormat.RFC3966);
+      // We remove the extension part from the formatted string before splitting it into different
+      // groups.
+      int endIndex = rfc3966Format.indexOf(';');
+      if (endIndex < 0) {
+        endIndex = rfc3966Format.length();
+      }
+      // The country-code will have a '-' following it.
+      int startIndex = rfc3966Format.indexOf('-') + 1;
+      return rfc3966Format.substring(startIndex, endIndex).split("-");
+    } else {
+      // We format the NSN only, and split that according to the separator.
+      String nationalSignificantNumber = util.getNationalSignificantNumber(number);
+      return util.formatNsnUsingPattern(nationalSignificantNumber,
+                                        formattingPattern, PhoneNumberFormat.RFC3966).split("-");
+    }
+  }
+
+  static boolean checkNumberGroupingIsValid(
+      PhoneNumber number, String candidate, PhoneNumberUtil util, NumberGroupingChecker checker) {
+    // TODO: Evaluate how this works for other locales (testing has been limited to NANPA regions)
+    // and optimise if necessary.
+    StringBuilder normalizedCandidate =
+        PhoneNumberUtil.normalizeDigits(candidate, true /* keep non-digits */);
+    String[] formattedNumberGroups = getNationalNumberGroups(util, number, null);
+    if (checker.checkGroups(util, number, normalizedCandidate, formattedNumberGroups)) {
+      return true;
+    }
+    return false;
+  }
+
+  static boolean containsMoreThanOneSlash(String candidate) {
+    int firstSlashIndex = candidate.indexOf('/');
+    return (firstSlashIndex > 0 && candidate.substring(firstSlashIndex + 1).contains("/"));
+  }
+
+  static boolean containsOnlyValidXChars(
+      PhoneNumber number, String candidate, PhoneNumberUtil util) {
+    // The characters 'x' and 'X' can be (1) a carrier code, in which case they always precede the
+    // national significant number or (2) an extension sign, in which case they always precede the
+    // extension number. We assume a carrier code is more than 1 digit, so the first case has to
+    // have more than 1 consecutive 'x' or 'X', whereas the second case can only have exactly 1 'x'
+    // or 'X'. We ignore the character if it appears as the last character of the string.
+    for (int index = 0; index < candidate.length() - 1; index++) {
+      char charAtIndex = candidate.charAt(index);
+      if (charAtIndex == 'x' || charAtIndex == 'X') {
+        char charAtNextIndex = candidate.charAt(index + 1);
+        if (charAtNextIndex == 'x' || charAtNextIndex == 'X') {
+          // This is the carrier code case, in which the 'X's always precede the national
+          // significant number.
+          index++;
+          if (util.isNumberMatch(number, candidate.substring(index)) != MatchType.NSN_MATCH) {
+            return false;
+          }
+        // This is the extension sign case, in which the 'x' or 'X' should always precede the
+        // extension number.
+        } else if (!PhoneNumberUtil.normalizeDigitsOnly(candidate.substring(index)).equals(
+            number.getExtension())) {
+            return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  static boolean isNationalPrefixPresentIfRequired(PhoneNumber number, PhoneNumberUtil util) {
+    // First, check how we deduced the country code. If it was written in international format, then
+    // the national prefix is not required.
+    if (number.getCountryCodeSource() != CountryCodeSource.FROM_DEFAULT_COUNTRY) {
+      return true;
+    }
+    String phoneNumberRegion =
+        util.getRegionCodeForCountryCode(number.getCountryCode());
+    PhoneMetadata metadata = util.getMetadataForRegion(phoneNumberRegion);
+    if (metadata == null) {
+      return true;
+    }
+    // Check if a national prefix should be present when formatting this number.
+    String nationalNumber = util.getNationalSignificantNumber(number);
+    NumberFormat formatRule =
+        util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
+    // To do this, we check that a national prefix formatting rule was present and that it wasn't
+    // just the first-group symbol ($1) with punctuation.
+    if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
+      if (formatRule.isNationalPrefixOptionalWhenFormatting()) {
+        // The national-prefix is optional in these cases, so we don't need to check if it was
+        // present.
+        return true;
+      }
+      // Remove the first-group symbol.
+      String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule();
+      // We assume that the first-group symbol will never be _before_ the national prefix.
+      candidateNationalPrefixRule =
+          candidateNationalPrefixRule.substring(0, candidateNationalPrefixRule.indexOf("$1"));
+      candidateNationalPrefixRule =
+          PhoneNumberUtil.normalizeDigitsOnly(candidateNationalPrefixRule);
+      if (candidateNationalPrefixRule.length() == 0) {
+        // National Prefix not needed for this number.
+        return true;
+      }
+      // Normalize the remainder.
+      String rawInputCopy = PhoneNumberUtil.normalizeDigitsOnly(number.getRawInput());
+      StringBuilder rawInput = new StringBuilder(rawInputCopy);
+      // Check if we found a national prefix and/or carrier code at the start of the raw input, and
+      // return the result.
+      return util.maybeStripNationalPrefixAndCarrierCode(rawInput, metadata, null);
+    }
+    return true;
+  }
+
+  public boolean hasNext() {
+    if (state == State.NOT_READY) {
+      lastMatch = find(searchIndex);
+      if (lastMatch == null) {
+        state = State.DONE;
+      } else {
+        searchIndex = lastMatch.end();
+        state = State.READY;
+      }
+    }
+    return state == State.READY;
+  }
+
+  public PhoneNumberMatch next() {
+    // Check the state and find the next match as a side-effect if necessary.
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+
+    // Don't retain that memory any longer than necessary.
+    PhoneNumberMatch result = lastMatch;
+    lastMatch = null;
+    state = State.NOT_READY;
+    return result;
+  }
+
+  /**
    * Always throws {@link UnsupportedOperationException} as removal is not supported.
    */
   public void remove() {
diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 4e3fbc3..a05c832 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -101,6 +101,10 @@
   private static final char STAR_SIGN = '*';
 
   private static final String RFC3966_EXTN_PREFIX = ";ext=";
+  private static final String RFC3966_PREFIX = "tel:";
+  // We include the "+" here since RFC3966 format specifies that the context must be specified in
+  // international format.
+  private static final String RFC3966_PHONE_CONTEXT = ";phone-context=+";
 
   // A map that contains characters that are essential when dialling. That means any of the
   // characters in this map must not be removed from a number when dialing, otherwise the call will
@@ -325,7 +329,7 @@
   private static final Pattern VALID_PHONE_NUMBER_PATTERN =
       Pattern.compile(VALID_PHONE_NUMBER + "(?:" + EXTN_PATTERNS_FOR_PARSING + ")?", REGEX_FLAGS);
 
-  private static final Pattern NON_DIGITS_PATTERN = Pattern.compile("(\\D+)");
+  static final Pattern NON_DIGITS_PATTERN = Pattern.compile("(\\D+)");
 
   // The FIRST_GROUP_PATTERN was originally set to $1 but there are some countries for which the
   // first group is not used in the national pattern (e.g. Argentina) so the $1 group does not match
@@ -453,10 +457,10 @@
       @Override
       boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) {
         if (!util.isValidNumber(number) ||
-            !containsOnlyValidXChars(number, candidate, util)) {
+            !PhoneNumberMatcher.containsOnlyValidXChars(number, candidate, util)) {
           return false;
         }
-        return isNationalPrefixPresentIfRequired(number, util);
+        return PhoneNumberMatcher.isNationalPrefixPresentIfRequired(number, util);
       }
     },
     /**
@@ -474,44 +478,20 @@
       @Override
       boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) {
         if (!util.isValidNumber(number) ||
-            !containsOnlyValidXChars(number, candidate, util) ||
-            containsMoreThanOneSlash(candidate) ||
-            !isNationalPrefixPresentIfRequired(number, util)) {
+            !PhoneNumberMatcher.containsOnlyValidXChars(number, candidate, util) ||
+            PhoneNumberMatcher.containsMoreThanOneSlash(candidate) ||
+            !PhoneNumberMatcher.isNationalPrefixPresentIfRequired(number, util)) {
           return false;
         }
-        // TODO: Evaluate how this works for other locales (testing has been
-        // limited to NANPA regions) and optimise if necessary.
-        String[] formattedNumberGroups = getNationalNumberGroups(util, number);
-        StringBuilder normalizedCandidate = normalizeDigits(candidate,
-                                                            true /* keep strip non-digits */);
-        int fromIndex = 0;
-        // Check each group of consecutive digits are not broken into separate groups in the
-        // {@code candidate} string.
-        for (int i = 0; i < formattedNumberGroups.length; i++) {
-          // Fails if the substring of {@code candidate} starting from {@code fromIndex} doesn't
-          // contain the consecutive digits in formattedNumberGroups[i].
-          fromIndex = normalizedCandidate.indexOf(formattedNumberGroups[i], fromIndex);
-          if (fromIndex < 0) {
-            return false;
-          }
-          // Moves {@code fromIndex} forward.
-          fromIndex += formattedNumberGroups[i].length();
-          if (i == 0 && fromIndex < normalizedCandidate.length()) {
-            // We are at the position right after the NDC.
-            if (Character.isDigit(normalizedCandidate.charAt(fromIndex))) {
-              // This means there is no formatting symbol after the NDC. In this case, we only
-              // accept the number if there is no formatting symbol at all in the number, except
-              // for extensions.
-              String nationalSignificantNumber = util.getNationalSignificantNumber(number);
-              return normalizedCandidate.substring(fromIndex - formattedNumberGroups[i].length())
-                  .startsWith(nationalSignificantNumber);
-            }
-          }
-        }
-        // The check here makes sure that we haven't mistakenly already used the extension to
-        // match the last group of the subscriber number. Note the extension cannot have
-        // formatting in-between digits.
-        return normalizedCandidate.substring(fromIndex).contains(number.getExtension());
+        return PhoneNumberMatcher.checkNumberGroupingIsValid(
+            number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() {
+              public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number,
+                                         StringBuilder normalizedCandidate,
+                                         String[] expectedNumberGroups) {
+                return PhoneNumberMatcher.allNumberGroupsRemainGrouped(
+                    util, number, normalizedCandidate, expectedNumberGroups);
+              }
+            });
       }
     },
     /**
@@ -529,143 +509,23 @@
       @Override
       boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) {
         if (!util.isValidNumber(number) ||
-            !containsOnlyValidXChars(number, candidate, util) ||
-            containsMoreThanOneSlash(candidate) ||
-            !isNationalPrefixPresentIfRequired(number, util)) {
+            !PhoneNumberMatcher.containsOnlyValidXChars(number, candidate, util) ||
+            PhoneNumberMatcher.containsMoreThanOneSlash(candidate) ||
+            !PhoneNumberMatcher.isNationalPrefixPresentIfRequired(number, util)) {
           return false;
         }
-        // TODO: Evaluate how this works for other locales (testing has been
-        // limited to NANPA regions) and optimise if necessary.
-        StringBuilder normalizedCandidate = normalizeDigits(candidate,
-                                                            true /* keep strip non-digits */);
-        String[] candidateGroups =
-            NON_DIGITS_PATTERN.split(normalizedCandidate.toString());
-        // Set this to the last group, skipping it if the number has an extension.
-        int candidateNumberGroupIndex =
-            number.hasExtension() ? candidateGroups.length - 2 : candidateGroups.length - 1;
-        // First we check if the national significant number is formatted as a block.
-        // We use contains and not equals, since the national significant number may be present with
-        // a prefix such as a national number prefix, or the country code itself.
-        if (candidateGroups.length == 1 ||
-            candidateGroups[candidateNumberGroupIndex].contains(
-                util.getNationalSignificantNumber(number))) {
-          return true;
-        }
-        String[] formattedNumberGroups = getNationalNumberGroups(util, number);
-        // Starting from the end, go through in reverse, excluding the first group, and check the
-        // candidate and number groups are the same.
-        for (int formattedNumberGroupIndex = (formattedNumberGroups.length - 1);
-             formattedNumberGroupIndex > 0 && candidateNumberGroupIndex >= 0;
-             formattedNumberGroupIndex--, candidateNumberGroupIndex--) {
-          if (!candidateGroups[candidateNumberGroupIndex].equals(
-              formattedNumberGroups[formattedNumberGroupIndex])) {
-            return false;
-          }
-        }
-        // Now check the first group. There may be a national prefix at the start, so we only check
-        // that the candidate group ends with the formatted number group.
-        return (candidateNumberGroupIndex >= 0 &&
-                candidateGroups[candidateNumberGroupIndex].endsWith(formattedNumberGroups[0]));
+        return PhoneNumberMatcher.checkNumberGroupingIsValid(
+            number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() {
+              public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number,
+                                         StringBuilder normalizedCandidate,
+                                         String[] expectedNumberGroups) {
+                return PhoneNumberMatcher.allNumberGroupsAreExactlyPresent(
+                    util, number, normalizedCandidate, expectedNumberGroups);
+              }
+            });
       }
     };
 
-    /**
-     * Helper method to get the national-number part of a number, formatted without any national
-     * prefix, and return it as a set of digit blocks that would be formatted together.
-     */
-    private static String[] getNationalNumberGroups(PhoneNumberUtil util, PhoneNumber number) {
-      // This will be in the format +CC-DG;ext=EXT where DG represents groups of digits.
-      String rfc3966Format = util.format(number, PhoneNumberFormat.RFC3966);
-      // We remove the extension part from the formatted string before splitting it into different
-      // groups.
-      int endIndex = rfc3966Format.indexOf(';');
-      if (endIndex < 0) {
-        endIndex = rfc3966Format.length();
-      }
-      // The country-code will have a '-' following it.
-      int startIndex = rfc3966Format.indexOf('-') + 1;
-      return rfc3966Format.substring(startIndex, endIndex).split("-");
-    }
-
-    private static boolean containsMoreThanOneSlash(String candidate) {
-      int firstSlashIndex = candidate.indexOf('/');
-      return (firstSlashIndex > 0 && candidate.substring(firstSlashIndex + 1).contains("/"));
-    }
-
-    private static boolean containsOnlyValidXChars(
-        PhoneNumber number, String candidate, PhoneNumberUtil util) {
-      // The characters 'x' and 'X' can be (1) a carrier code, in which case they always precede the
-      // national significant number or (2) an extension sign, in which case they always precede the
-      // extension number. We assume a carrier code is more than 1 digit, so the first case has to
-      // have more than 1 consecutive 'x' or 'X', whereas the second case can only have exactly 1
-      // 'x' or 'X'. We ignore the character if it appears as the last character of the string.
-      for (int index = 0; index < candidate.length() - 1; index++) {
-        char charAtIndex = candidate.charAt(index);
-        if (charAtIndex == 'x' || charAtIndex == 'X') {
-          char charAtNextIndex = candidate.charAt(index + 1);
-          if (charAtNextIndex == 'x' || charAtNextIndex == 'X') {
-            // This is the carrier code case, in which the 'X's always precede the national
-            // significant number.
-            index++;
-            if (util.isNumberMatch(number, candidate.substring(index)) != MatchType.NSN_MATCH) {
-              return false;
-            }
-          // This is the extension sign case, in which the 'x' or 'X' should always precede the
-          // extension number.
-          } else if (!PhoneNumberUtil.normalizeDigitsOnly(candidate.substring(index)).equals(
-              number.getExtension())) {
-              return false;
-          }
-        }
-      }
-      return true;
-    }
-
-    private static boolean isNationalPrefixPresentIfRequired(
-        PhoneNumber number, PhoneNumberUtil util) {
-      // First, check how we deduced the country code. If it was written in international format,
-      // then the national prefix is not required.
-      if (number.getCountryCodeSource() != CountryCodeSource.FROM_DEFAULT_COUNTRY) {
-        return true;
-      }
-      String phoneNumberRegion =
-          util.getRegionCodeForCountryCode(number.getCountryCode());
-      PhoneMetadata metadata = util.getMetadataForRegion(phoneNumberRegion);
-      if (metadata == null) {
-        return true;
-      }
-      // Check if a national prefix should be present when formatting this number.
-      String nationalNumber = util.getNationalSignificantNumber(number);
-      NumberFormat formatRule =
-          util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber);
-      // To do this, we check that a national prefix formatting rule was present and that it wasn't
-      // just the first-group symbol ($1) with punctuation.
-      if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
-        if (formatRule.isNationalPrefixOptionalWhenFormatting()) {
-          // The national-prefix is optional in these cases, so we don't need to check if it was
-          // present.
-          return true;
-        }
-        // Remove the first-group symbol.
-        String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule();
-        // We assume that the first-group symbol will never be _before_ the national prefix.
-        candidateNationalPrefixRule =
-            candidateNationalPrefixRule.substring(0, candidateNationalPrefixRule.indexOf("$1"));
-        candidateNationalPrefixRule = normalizeDigitsOnly(candidateNationalPrefixRule);
-        if (candidateNationalPrefixRule.length() == 0) {
-          // National Prefix not needed for this number.
-          return true;
-        }
-        // Normalize the remainder.
-        String rawInputCopy = normalizeDigitsOnly(number.getRawInput());
-        StringBuilder rawInput = new StringBuilder(rawInputCopy);
-        // Check if we found a national prefix and/or carrier code at the start of the raw input,
-        // and return the result.
-        return util.maybeStripNationalPrefixAndCarrierCode(rawInput, metadata, null);
-      }
-      return true;
-    }
-
     /** Returns true if {@code number} is a verified number according to this leniency. */
     abstract boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util);
   }
@@ -822,7 +682,7 @@
     return normalizeDigits(number, false /* strip non-digits */).toString();
   }
 
-  private static StringBuilder normalizeDigits(String number, boolean keepNonDigits) {
+  static StringBuilder normalizeDigits(String number, boolean keepNonDigits) {
     StringBuilder normalizedDigits = new StringBuilder(number.length());
     for (char c : number.toCharArray()) {
       int digit = Character.digit(c, 10);
@@ -844,7 +704,7 @@
   }
 
   /**
-   * Gets the length of the geographical area code in the {@code nationalNumber_} field of the
+   * Gets the length of the geographical area code from the {@code nationalNumber_} field of the
    * PhoneNumber object passed in, so that clients could use it to split a national significant
    * number into geographical area code and subscriber number. It works in such a way that the
    * resultant subscriber number should be diallable, at least on some devices. An example of how
@@ -889,7 +749,9 @@
       return 0;
     }
     PhoneMetadata metadata = getMetadataForRegion(regionCode);
-    if (!metadata.hasNationalPrefix()) {
+    // If a country doesn't use a national prefix, and this number doesn't have an Italian leading
+    // zero, we assume it is a closed dialling plan with no area codes.
+    if (!metadata.hasNationalPrefix() && !number.isItalianLeadingZero()) {
       return 0;
     }
 
@@ -1667,7 +1529,7 @@
         return;
       case RFC3966:
         formattedNumber.insert(0, "-").insert(0, countryCallingCode).insert(0, PLUS_SIGN)
-            .insert(0, "tel:");
+            .insert(0, RFC3966_PREFIX);
         return;
       case NATIONAL:
       default:
@@ -1701,8 +1563,8 @@
         : formatNsnUsingPattern(number, formattingPattern, numberFormat, carrierCode);
   }
 
-  private NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
-                                                        String nationalNumber) {
+  NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
+                                                String nationalNumber) {
     for (NumberFormat numFormat : availableFormats) {
       int size = numFormat.leadingDigitsPatternSize();
       if (size == 0 || regexCache.getPatternForRegex(
@@ -1718,9 +1580,9 @@
   }
 
   // Simple wrapper of formatNsnUsingPattern for the common case of no carrier code.
-  private String formatNsnUsingPattern(String nationalNumber,
-                                       NumberFormat formattingPattern,
-                                       PhoneNumberFormat numberFormat) {
+  String formatNsnUsingPattern(String nationalNumber,
+                               NumberFormat formattingPattern,
+                               PhoneNumberFormat numberFormat) {
     return formatNsnUsingPattern(nationalNumber, formattingPattern, numberFormat, null);
   }
 
@@ -2750,17 +2612,34 @@
       throw new NumberParseException(NumberParseException.ErrorType.TOO_LONG,
                                      "The string supplied was too long to parse.");
     }
-    // Extract a possible number from the string passed in (this strips leading characters that
-    // could not be the start of a phone number.)
-    String number = extractPossibleNumber(numberToParse);
-    if (!isViablePhoneNumber(number)) {
+
+    int indexOfPhoneContext = numberToParse.indexOf(RFC3966_PHONE_CONTEXT);
+    StringBuilder nationalNumber = new StringBuilder();
+    if (indexOfPhoneContext > 0) {
+      // Prefix the number with the phone context. The offset here is because the context we are
+      // expecting to match should start with a "+" sign, and we want to include this at the start
+      // of the number.
+      nationalNumber.append(numberToParse.substring(indexOfPhoneContext +
+                                                    RFC3966_PHONE_CONTEXT.length() - 1));
+      // Now append everything between the "tel:" prefix and the phone-context.
+      nationalNumber.append(numberToParse.substring(
+          numberToParse.indexOf(RFC3966_PREFIX) + RFC3966_PREFIX.length(), indexOfPhoneContext));
+      // Note that phone-contexts that are URLs will not be parsed - isViablePhoneNumber will throw
+      // an exception below.
+    } else {
+      // Extract a possible number from the string passed in (this strips leading characters that
+      // could not be the start of a phone number.)
+      nationalNumber.append(extractPossibleNumber(numberToParse));
+    }
+
+    if (!isViablePhoneNumber(nationalNumber.toString())) {
       throw new NumberParseException(NumberParseException.ErrorType.NOT_A_NUMBER,
                                      "The string supplied did not seem to be a phone number.");
     }
 
     // Check the region supplied is valid, or that the extracted number starts with some sort of +
     // sign so the number's region can be determined.
-    if (checkRegion && !checkRegionForParsing(number, defaultRegion)) {
+    if (checkRegion && !checkRegionForParsing(nationalNumber.toString(), defaultRegion)) {
       throw new NumberParseException(NumberParseException.ErrorType.INVALID_COUNTRY_CODE,
                                      "Missing or invalid default region.");
     }
@@ -2768,7 +2647,6 @@
     if (keepRawInput) {
       phoneNumber.setRawInput(numberToParse);
     }
-    StringBuilder nationalNumber = new StringBuilder(number);
     // Attempt to parse extension first, since it doesn't require region-specific data and we want
     // to have the non-normalised number here.
     String extension = maybeStripExtension(nationalNumber);
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index 5461867..706c99b 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
index 41ec785..119a9bc 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index ca23407..1613720 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index b17217a..f53db36 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index ad53ba8..c1ad023 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index cf947d7..4c79a92 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 463aaa6..16582aa 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index e268fcc..5b0cbf7 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index d2b1de1..476bdee 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index 64a3960..a5198af 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 6f1ad28..15576b0 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index e3da054..5383277 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index 1550a36..04ee2d5 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index b9c11bf..b6a16d9 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index 4005380..bb616c2 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index 1b1536c..0f12bee 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index 3002dfb..a1f84c7 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 47b6459..67286b2 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 1e38279..dd1598c 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index 4c69dd9..61fb88a 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index b84a79f..4bc0e39 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 8532e86..6b25496 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index 7576e86..71300ab 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index 8d1c21f..622cc98 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index a6baf05..04618ff 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index fb05cd8..0814419 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index c30a5aa..4f71d89 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index aedacce..020ad53 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index d775464..c3eddf7 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 05e5ccc..8efafcf 100644
--- a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
+++ b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1201_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1201_en
index bb98273..bfb7284 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1201_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1201_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1203_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1203_en
index 93786eb..6d49709 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1203_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1203_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1204_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1204_en
index eaad437..614c39d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1204_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1204_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1205_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1205_en
index 8fb3949..3097e30 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1205_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1205_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1206_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1206_en
index e5ee177..816ec8d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1206_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1206_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1207_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1207_en
index 4d720c3..8a07093 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1207_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1207_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1208_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1208_en
index 0c503bf..919ab5f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1208_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1208_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1209_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1209_en
index f55fa82..48ff1b6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1209_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1209_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1214_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1214_en
index 1a736df..be95d32 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1214_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1214_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1215_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1215_en
index 9caefe3..1036ab1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1215_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1215_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1216_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1216_en
index 5305522..f527d56 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1216_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1216_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1217_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1217_en
index b6e2606..a83682c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1217_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1217_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1218_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1218_en
index 52851ba..1d7a05b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1218_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1218_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1219_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1219_en
index 5731a17..339e944 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1219_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1219_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1225_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1225_en
index 32ee0d0..e2d45b7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1225_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1225_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1228_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1228_en
index 5440111..c0df16f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1228_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1228_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1229_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1229_en
index bd6c00f..56046b8 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1229_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1229_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1231_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1231_en
index 3a137ed..c993c36 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1231_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1231_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1239_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1239_en
index ed594ca..042ce57 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1239_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1239_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1248_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1248_en
index cc14c9e..d2ae6e2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1248_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1248_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1250_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1250_en
index 4f1f495..0c6ad86 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1250_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1250_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1251_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1251_en
index dd34251..1348c9c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1251_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1251_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1252_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1252_en
index d4243ab..1bca80f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1252_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1252_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1253_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1253_en
index ca292d9..2f3cb98 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1253_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1253_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1254_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1254_en
index 8c090c8..7b35f53 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1254_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1254_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1256_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1256_en
index b954f65..ad4be8b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1256_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1256_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1260_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1260_en
index 1d112d9..aaba3a6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1260_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1260_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1262_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1262_en
index a0ba4c0..46d7cc9 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1262_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1262_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1267_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1267_en
index 3c8fba6..2c9e461 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1267_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1267_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1269_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1269_en
index 7111bf4..22f2231 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1269_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1269_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1270_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1270_en
index 81775d7..511cf8f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1270_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1270_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1276_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1276_en
index 95d98ab..488106b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1276_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1276_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1281_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1281_en
index 67a497f..6bea3ed 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1281_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1281_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1289_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1289_en
index a44c5b3..52c9f25 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1289_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1289_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1301_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1301_en
index fdec02f..5e9fcbb 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1301_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1301_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1302_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1302_en
index d9578c8..b739c04 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1302_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1302_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1303_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1303_en
index 2df62e6..e663f98 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1303_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1303_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1304_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1304_en
index 812f34b..04a3c57 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1304_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1304_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1305_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1305_en
index ddc522f..69bb00a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1305_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1305_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1306_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1306_en
index 35094f0..f2c20aa 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1306_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1306_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1307_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1307_en
index 9a851de..1fe1b0e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1307_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1307_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1308_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1308_en
index b0545ca..5d8dfdb 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1308_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1308_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1309_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1309_en
index d5029f8..5847bbd 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1309_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1309_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1310_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
index 8340bba..18fb6d1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1313_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1313_en
index e09f6cd..ccc2514 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1313_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1313_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1314_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1314_en
index 576ac1c..d54665f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1314_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1314_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1315_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1315_en
index c097de2..dddfc00 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1315_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1315_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1316_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1316_en
index eae6b38..3c7b03a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1316_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1316_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1317_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1317_en
index e577222..61a443c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1317_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1317_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1318_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1318_en
index 3e48ecc..a52084b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1318_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1318_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1319_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1319_en
index f690c73..0408dba 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1319_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1319_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1320_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1320_en
index 6441a1d..60cec30 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1320_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1320_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1321_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1321_en
index a3e406e..7696e6b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1321_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1321_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1323_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1323_en
index 8571ced..6efc933 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1323_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1323_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1325_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1325_en
index e3f8595..9f3341f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1325_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1325_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1330_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1330_en
index a3f3b7e..ce3078a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1330_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1330_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1334_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1334_en
index 2aab6a1..1cec5ea 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1334_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1334_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1336_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1336_en
index a873afc..7c2e347 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1336_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1336_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1337_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1337_en
index 6de57a4..f3b85a4 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1337_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1337_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1347_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1347_en
index 4b4c5dc..4680276 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1347_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1347_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1352_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1352_en
index ec62795..47e5610 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1352_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1352_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1360_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1360_en
index f9a5a8a..f741062 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1360_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1360_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1361_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1361_en
index 5c221a9..367d7ab 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1361_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1361_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1386_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1386_en
index 45049ba..f81e4c0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1386_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1386_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1401_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1401_en
index 7293621..033cb90 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1401_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1401_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1402_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1402_en
index d93b8c9..ef231cf 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1402_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1402_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1403_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1403_en
index b606c26..e5aefdf 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1403_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1403_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1404_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1404_en
index bf273a3..6711a72 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1404_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1404_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1405_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1405_en
index 9722abc..1da9a43 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1405_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1405_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1406_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1406_en
index 4874675..8a6c5b4 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1406_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1406_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1407_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1407_en
index 6acfc6a..0f230ae 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1407_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1407_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1408_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1408_en
index 62ac82a..e5fe7cf 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1408_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1408_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1409_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1409_en
index 15d8a3a..f0bcc3c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1409_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1409_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1410_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1410_en
index 2e3c4ac..8b97ebd 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1410_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1410_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1412_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1412_en
index ed26616..bf074a9 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1412_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1412_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1413_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1413_en
index 7cf4cee..d41a004 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1413_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1413_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1414_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1414_en
index 717dbd7..eeea85a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1414_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1414_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1415_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1415_en
index 9079586..ee43626 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1415_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1415_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1416_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1416_en
index d6e6f96..b386925 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1416_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1416_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1417_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1417_en
index ac551fd..309b341 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1417_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1417_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1418_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1418_en
index 8667894..fd1f298 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1418_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1418_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1419_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1419_en
index fb7548b..198fdd7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1419_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1419_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1423_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1423_en
index 9023400..0aad258 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1423_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1423_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1425_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1425_en
index 7d7084e..2563be7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1425_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1425_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1432_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1432_en
index 9c8a2ca..ed0e50d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1432_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1432_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1434_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1434_en
index 82fb900..ed75d33 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1434_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1434_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1435_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1435_en
index db6c64f..ef84cd5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1435_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1435_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1440_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1440_en
index fd860de..65af0ae 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1440_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1440_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1450_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1450_en
index 4950cd8..48fd1db 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1450_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1450_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1469_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1469_en
index d1caf62..5bc910e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1469_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1469_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1478_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1478_en
index e5b09f9..962478d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1478_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1478_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1479_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1479_en
index 51ab912..475fcc1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1479_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1479_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1480_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1480_en
index 8c259c0..2b91c33 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1480_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1480_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1501_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1501_en
index 7e118f6..c45bf8d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1501_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1501_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1502_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1502_en
index a7a5b99..9380c36 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1502_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1502_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1503_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1503_en
index 48d05d4..281efad 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1503_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1503_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1504_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1504_en
index 49c0b85..b57a1b6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1504_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1504_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1505_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1505_en
index c4eb180..c874e6d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1505_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1505_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1506_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1506_en
index 6a7b473..39704d7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1506_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1506_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1507_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1507_en
index dc76325..55c8ce5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1507_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1507_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1508_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1508_en
index 3e9ce41..62a3411 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1508_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1508_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1509_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1509_en
index 12fbdc6..7a36f9a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1509_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1509_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1510_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1510_en
index b342c22..8220a33 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1510_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1510_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1512_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1512_en
index 63b9995..d828bd3 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1512_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1512_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1513_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1513_en
index 338c8f1..db2c54c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1513_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1513_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1514_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1514_en
index 8f5d124..2e28624 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1514_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1514_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1515_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1515_en
index fada095..0547084 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1515_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1515_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1516_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1516_en
index 39e0138..b41d70a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1516_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1516_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1517_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1517_en
index f017efc..12f0ed6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1517_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1517_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1518_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1518_en
index d57a9e0..17f4f39 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1518_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1518_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1519_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1519_en
index 184ffbf..d942f22 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1519_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1519_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1520_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1520_en
index 1930d45..986969c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1520_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1520_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1530_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1530_en
index 0ba769f..1141677 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1530_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1530_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1540_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1540_en
index 2056d8f..e143cc7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1540_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1540_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1541_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1541_en
index def6616..aec7f0d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1541_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1541_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1559_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1559_en
index a798388..8ead4a9 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1559_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1559_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1561_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1561_en
index a5c4d8e..64e0df5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1561_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1561_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1562_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1562_en
index ae32a56..f1e7eeb 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1562_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1562_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1563_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1563_en
index 1a6094f..710a761 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1563_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1563_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1570_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1570_en
index c8491c1..a8f7447 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1570_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1570_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1573_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1573_en
index e952524..6072681 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1573_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1573_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1574_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1574_en
index 2eb7589..1add8fb 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1574_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1574_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1575_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1575_en
index 5a8f792..8977a0c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1575_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1575_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1580_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1580_en
index fe11647..1be41a7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1580_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1580_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1585_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1585_en
index f55ba0f..29c4ff2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1585_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1585_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1586_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1586_en
index 721c4d0..74d4b1d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1586_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1586_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1601_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1601_en
index 45e0d3c..6c23a22 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1601_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1601_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1602_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1602_en
index b1d2266..6226a8d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1602_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1602_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1603_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1603_en
index dc28c76..5ffd46e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1603_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1603_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1604_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1604_en
index 6175abd..35486bd 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1604_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1604_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1605_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1605_en
index 6f80f31..039a97c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1605_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1605_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1606_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1606_en
index 30810b4..a0b4a85 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1606_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1606_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1607_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1607_en
index 70c77da..bfb5611 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1607_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1607_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1608_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1608_en
index e29fcc2..5946b93 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1608_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1608_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1609_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1609_en
index 8819bb4..cb6ac31 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1609_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1609_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1610_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1610_en
index ad86252..f177a7f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1610_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1610_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1612_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1612_en
index 2fb4156..396c6fd 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1612_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1612_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1613_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1613_en
index e1df260..4479bf2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1613_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1613_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1614_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1614_en
index f9d0201..2082f0f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1614_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1614_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1615_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1615_en
index 5347dff..767825a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1615_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1615_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1616_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1616_en
index b6bef4d..f3a8432 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1616_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1616_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1617_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1617_en
index 6d47691..426df63 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1617_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1617_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1618_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1618_en
index 074da52..b8749d1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1618_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1618_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1619_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1619_en
index 5781415..872b63a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1619_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1619_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1620_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1620_en
index 1428f52..dd12bdb 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1620_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1620_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1623_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1623_en
index fa04f3a..2a2e590 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1623_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1623_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1626_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1626_en
index 8243d25..c2ec034 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1626_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1626_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1630_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1630_en
index a545ba1..8aa798d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1630_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1630_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1631_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1631_en
index a3e4b30..464da02 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1631_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1631_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1636_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1636_en
index c6e31ce..481957a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1636_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1636_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1641_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1641_en
index 09d37ff..5c33288 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1641_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1641_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1646_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1646_en
index 7029025..3580ed7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1646_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1646_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1650_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1650_en
index 349fdcf..b7fd63a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1650_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1650_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1651_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1651_en
index edd6f90..4a62178 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1651_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1651_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1660_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1660_en
index 84167e8..e563f6b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1660_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1660_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1661_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1661_en
index 163197a..07ecf5f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1661_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1661_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1662_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1662_en
index 89104de..2c1e7d3 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1662_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1662_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1678_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1678_en
index 287de14..5e59450 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1678_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1678_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1682_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1682_en
index f70ae44..150c61e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1682_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1682_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1701_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1701_en
index 402f3c2..8c6bf6c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1701_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1701_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1702_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1702_en
index b5cb753..f92724b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1702_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1702_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1703_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1703_en
index 3196a8e..7db5cad 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1703_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1703_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1704_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1704_en
index 65928c3..41c1069 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1704_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1704_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1705_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1705_en
index 441b558..1389dd0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1705_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1705_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1706_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1706_en
index 988df79..5e79641 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1706_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1706_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1707_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1707_en
index 37194ec..31c062b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1707_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1707_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1708_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1708_en
index b68c3aa..9b0cf4d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1708_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1708_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1709_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1709_en
index 1047732..ac9a808 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1709_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1709_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1712_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1712_en
index 92a81f1..bb3a5a0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1712_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1712_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1713_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1713_en
index 5ca9b5e..7621893 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1713_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1713_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1714_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1714_en
index ffc4f85..cfc609b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1714_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1714_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1715_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1715_en
index 0079c6b..8469e59 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1715_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1715_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1716_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1716_en
index b393523..cccb935 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1716_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1716_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1717_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1717_en
index 876a808..3f8db32 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1717_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1717_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1718_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1718_en
index 4a16abb..8710319 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1718_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1718_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1719_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1719_en
index dc6d6a7..a553d0b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1719_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1719_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1720_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1720_en
index aa2deb2..b99f8a4 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1720_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1720_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1724_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1724_en
index b95249e..4a8e38a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1724_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1724_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1727_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1727_en
index f59ce52..d61bfc2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1727_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1727_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1731_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1731_en
index e041cac..9522421 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1731_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1731_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1732_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1732_en
index 244a2c9..8d7e0b1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1732_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1732_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1734_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1734_en
index 06f2135..74bd262 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1734_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1734_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1740_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1740_en
index 7ed9506..7054b20 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1740_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1740_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1757_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1757_en
index 97714b5..9c1082d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1757_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1757_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1760_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1760_en
index 40854a6..e02b6f4 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1760_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1760_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1763_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1763_en
index 971e1ac..93e872b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1763_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1763_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1765_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1765_en
index 1e87dcc..c43016a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1765_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1765_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1770_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1770_en
index 01bc96d..322e453 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1770_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1770_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1772_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1772_en
index 3e6641b..523b2f1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1772_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1772_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1775_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1775_en
index 879e514..ae7b0de 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1775_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1775_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1778_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1778_en
index c6b9c96..6599bca 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1778_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1778_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1780_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1780_en
index fdeddcc..69d9719 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1780_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1780_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1781_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1781_en
index ea2f926..7f17d65 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1781_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1781_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1785_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1785_en
index 0ca48dd..c8900aa 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1785_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1785_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1786_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1786_en
index 612dd69..864dc4d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1786_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1786_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1801_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1801_en
index c93ac1a..5ff2628 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1801_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1801_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1802_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1802_en
index 8fd7eb6..4d3faae 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1802_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1802_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1803_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1803_en
index 0732fbb..43cbdf4 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1803_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1803_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1804_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1804_en
index 6f70d2c..38412d6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1804_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1804_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1805_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1805_en
index 47c5bf3..022a981 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1805_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1805_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1806_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1806_en
index 4674327..c3c3e03 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1806_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1806_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1807_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1807_en
index 86fde6d..241f29c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1807_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1807_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1808_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1808_en
index b810cfb..74408f0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1808_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1808_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1809_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1809_en
new file mode 100644
index 0000000..6a6365d
--- /dev/null
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1809_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1810_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1810_en
index c1e3af7..db3ba66 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1810_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1810_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1812_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1812_en
index 0ba83df..af5c14e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1812_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1812_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1813_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1813_en
index 7fb187f..35aa8ee 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1813_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1813_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1814_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1814_en
index 2c05f2f..ee8c48e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1814_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1814_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1815_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1815_en
index a80e7e8..8096968 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1815_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1815_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1816_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1816_en
index fbfc566..64a2ae7 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1816_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1816_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1817_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1817_en
index 22f36cc..c160bf5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1817_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1817_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1818_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1818_en
index 78cef0c..f4460e5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1818_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1818_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1819_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1819_en
index 42ab96a..ababd07 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1819_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1819_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1828_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1828_en
index a83f8fc..39ac69a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1828_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1828_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1830_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1830_en
index b9dd2bb..ce794f6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1830_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1830_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1831_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1831_en
index 2706c69..4df3641 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1831_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1831_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1832_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1832_en
index 77a8d42..e42842c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1832_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1832_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1843_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1843_en
index ec90963..e3dff31 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1843_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1843_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1845_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1845_en
index 7ad004c..0a0da01 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1845_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1845_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1847_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1847_en
index 0531619..d765fd1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1847_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1847_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1850_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1850_en
index 4157758..6e7f105 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1850_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1850_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1856_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1856_en
index d5ce6b3..d04d220 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1856_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1856_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1858_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1858_en
index d036af8..c4351db 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1858_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1858_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1859_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1859_en
index 82eae89..1d13302 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1859_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1859_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1860_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1860_en
index 24f9897..c3cc31f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1860_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1860_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1863_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1863_en
index 37b26a9..a8568fa 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1863_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1863_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1864_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1864_en
index 99aa6db..73963f0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1864_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1864_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1865_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1865_en
index 2fa95f3..8ccb3f2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1865_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1865_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1870_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1870_en
index 626fe8e..a8fc86a 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1870_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1870_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1901_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1901_en
index d54c8b4..442f87e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1901_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1901_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1902_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1902_en
index 89897a9..daae6ff 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1902_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1902_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1903_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1903_en
index 86d1f70..80ac3d5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1903_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1903_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1904_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1904_en
index ad534ce..32967f1 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1904_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1904_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1905_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1905_en
index a445998..b29fbf0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1905_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1905_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1906_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1906_en
index 2919ad0..79a7bed 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1906_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1906_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1907_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1907_en
index 04c63e2..7d7feda 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1907_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1907_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1908_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1908_en
index 99c0e32..8428b04 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1908_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1908_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1909_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1909_en
index 457e115..bb1e53d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1909_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1909_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1910_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1910_en
index 11e93fe..a599b5c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1910_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1910_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1912_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1912_en
index 30ec7de..569493c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1912_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1912_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1913_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1913_en
index 0272f76..5869fab 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1913_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1913_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1914_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1914_en
index e19a7bf..6a15d24 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1914_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1914_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1915_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1915_en
index 6adc9ae..34b9a4c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1915_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1915_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1916_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1916_en
index 766cf63..4dd6f2d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1916_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1916_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1917_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1917_en
index 72c9476..7639004 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1917_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1917_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1918_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1918_en
index 034ceea..4dc6d5e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1918_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1918_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1919_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1919_en
index 66b5a93..30231aa 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1919_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1919_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1920_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1920_en
index 5e75d99..25b9df2 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1920_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1920_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1925_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1925_en
index defa317..6e47351 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1925_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1925_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1928_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1928_en
index cc06485..7b40875 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1928_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1928_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1931_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1931_en
index 2cbd816..b60a94d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1931_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1931_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1936_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1936_en
index c8bdcff..8964ddc 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1936_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1936_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1937_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1937_en
index 2698438..33b110f 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1937_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1937_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1940_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1940_en
index a100c66..c48dde5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1940_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1940_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1941_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1941_en
index 30f5f87..08236c3 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1941_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1941_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1949_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1949_en
index 8dd0dd5..9fb91be 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1949_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1949_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1951_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1951_en
index 9812455..52070ee 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1951_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1951_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1952_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1952_en
index 86ddc13..d718ec5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1952_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1952_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1954_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1954_en
index 1f79669..80be3b0 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1954_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1954_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1956_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1956_en
index cfe7888..b7fc7e8 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1956_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1956_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1970_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1970_en
index 4a9fd6c..40efb44 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1970_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1970_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1972_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1972_en
index 3335253..172c9b5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1972_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1972_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1973_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1973_en
index d682cc7..78c7cde 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1973_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1973_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1978_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1978_en
index 8f02daf..6e85a73 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1978_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1978_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1979_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1979_en
index 9d9d449..92cce0d 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1979_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1979_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1980_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1980_en
index f1d82a3..077efa5 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1980_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1980_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1985_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1985_en
index 73336d9..a8b1d83 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1985_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1985_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/1989_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/1989_en
index 42db96d..0ded847 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/1989_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/1989_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/20_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/20_en
index 76b227e..17bd9a6 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/20_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/20_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/233_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/233_en
index aca1927..726d581 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/233_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/233_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/31_nl b/java/src/com/android/i18n/phonenumbers/geocoding/data/31_nl
index 78768ba..dc25957 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/31_nl
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/31_nl
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/33_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/33_en
index 7e9655f..c12cc79 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/33_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/33_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/33_fr b/java/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
index 85f2c6b..62de895 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/33_fr
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/352_de b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_de
index d20ebca..c43da58 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/352_de
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_de
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/352_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_en
index e510e7b..a6a5f62 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/352_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/352_fr b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_fr
new file mode 100644
index 0000000..20b8469
--- /dev/null
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/352_fr
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/374_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/374_en
index 8bdf764..df33841 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/374_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/374_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/54_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/54_en
index 3f39869..354bd2e 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/54_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/54_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/54_es b/java/src/com/android/i18n/phonenumbers/geocoding/data/54_es
index afd958b..7523b6c 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/54_es
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/54_es
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/56_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/56_en
index 9126f78..fa097e8 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/56_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/56_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/56_es b/java/src/com/android/i18n/phonenumbers/geocoding/data/56_es
index 9126f78..c86ff79 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/56_es
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/56_es
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en
index b5b21b7..fcc8652 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh
index bbd7660..ed87a7b 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh
Binary files differ
diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/config b/java/src/com/android/i18n/phonenumbers/geocoding/data/config
index 8b2181a..1f71c41 100644
--- a/java/src/com/android/i18n/phonenumbers/geocoding/data/config
+++ b/java/src/com/android/i18n/phonenumbers/geocoding/data/config
Binary files differ
diff --git a/java/test/com/android/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/test/com/android/i18n/phonenumbers/PhoneNumberMatcherTest.java
index 82ea830..22afc71 100644
--- a/java/test/com/android/i18n/phonenumbers/PhoneNumberMatcherTest.java
+++ b/java/test/com/android/i18n/phonenumbers/PhoneNumberMatcherTest.java
@@ -232,6 +232,7 @@
     assertFalse(PhoneNumberMatcher.isLatinLetter('.'));
     assertFalse(PhoneNumberMatcher.isLatinLetter(' '));
     assertFalse(PhoneNumberMatcher.isLatinLetter('\u6211'));  // Chinese character
+    assertFalse(PhoneNumberMatcher.isLatinLetter('\u306E'));  // Hiragana letter no
   }
 
   public void testMatchesWithSurroundingLatinChars() throws Exception {
@@ -415,7 +416,7 @@
   };
 
   /**
-   * Strings with number-like things that should found at all levels.
+   * Strings with number-like things that should be found at all levels.
    */
   private static final NumberTest[] EXACT_GROUPING_CASES = {
     new NumberTest("\uFF14\uFF11\uFF15\uFF16\uFF16\uFF16\uFF17\uFF17\uFF17\uFF17", RegionCode.US),
diff --git a/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java
index 83e5da7..1abf982 100644
--- a/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -200,6 +200,9 @@
     // Google Sydney, which has area code "2".
     assertEquals(1, phoneUtil.getLengthOfGeographicalAreaCode(AU_NUMBER));
 
+    // Italian numbers - there is no national prefix, but it still has an area code.
+    assertEquals(2, phoneUtil.getLengthOfGeographicalAreaCode(IT_NUMBER));
+
     // Google Singapore. Singapore has no area code and no national prefix.
     assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(SG_NUMBER));
 
@@ -1528,6 +1531,10 @@
     // National prefix attached and some formatting present.
     assertEquals(NZ_NUMBER, phoneUtil.parse("03-331 6005", RegionCode.NZ));
     assertEquals(NZ_NUMBER, phoneUtil.parse("03 331 6005", RegionCode.NZ));
+    // Test parsing RFC3966 format with a phone context.
+    assertEquals(NZ_NUMBER, phoneUtil.parse("tel:03-331-6005;phone-context=+64", RegionCode.NZ));
+    assertEquals(NZ_NUMBER, phoneUtil.parse("tel:331-6005;phone-context=+64-3", RegionCode.NZ));
+    assertEquals(NZ_NUMBER, phoneUtil.parse("tel:331-6005;phone-context=+64-3", RegionCode.US));
 
     // Testing international prefixes.
     // Should strip country calling code.
@@ -1896,6 +1903,33 @@
     } catch (NullPointerException e) {
       fail("Null string - but should not throw a null pointer exception.");
     }
+    try {
+      String domainRfcPhoneContext = "tel:555-1234;phone-context:www.google.com";
+      phoneUtil.parse(domainRfcPhoneContext, RegionCode.US);
+      fail("Domain provided for phone context - should fail.");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals("Wrong error type stored in exception.",
+                   NumberParseException.ErrorType.NOT_A_NUMBER,
+                   e.getErrorType());
+    } catch (NullPointerException e) {
+      fail("Domain provided for phone context - but should not throw a null pointer exception.");
+    }
+    try {
+      // This is invalid because no "+" sign is present as part of phone-context. This should not
+      // succeed in being parsed.
+      String invalidRfcPhoneContext = "tel:555-1234;phone-context:1-331";
+      phoneUtil.parse(invalidRfcPhoneContext, RegionCode.US);
+      fail("No leading plus provided in phone context - should fail.");
+    } catch (NumberParseException e) {
+      // Expected this exception.
+      assertEquals("Wrong error type stored in exception.",
+                   NumberParseException.ErrorType.NOT_A_NUMBER,
+                   e.getErrorType());
+    } catch (NullPointerException e) {
+      fail("No leading plus provided in phone context - but should not throw a null pointer " +
+           "exception.");
+    }
   }
 
   public void testParseNumbersWithPlusWithNoRegion() throws Exception {
@@ -1909,6 +1943,10 @@
     assertEquals(NZ_NUMBER, phoneUtil.parse("+64 3 331 6005", null));
     assertEquals(INTERNATIONAL_TOLL_FREE, phoneUtil.parse("+800 1234 5678", null));
 
+    // Test parsing RFC3966 format with a phone context.
+    assertEquals(NZ_NUMBER, phoneUtil.parse("tel:03-331-6005;phone-context=+64", RegionCode.ZZ));
+    assertEquals(NZ_NUMBER, phoneUtil.parse("  tel:03-331-6005;phone-context=+64", RegionCode.ZZ));
+
     // It is important that we set the carrier code to an empty string, since we used
     // ParseAndKeepRawInput and no carrier code was found.
     PhoneNumber nzNumberWithRawInput = new PhoneNumber().mergeFrom(NZ_NUMBER).
@@ -1949,6 +1987,8 @@
     assertEquals(ukNumber, phoneUtil.parse("+44 2034567890 x 456  ", RegionCode.GB));
     assertEquals(ukNumber, phoneUtil.parse("+44 2034567890  X 456", RegionCode.GB));
     assertEquals(ukNumber, phoneUtil.parse("+44-2034567890;ext=456", RegionCode.GB));
+    assertEquals(ukNumber, phoneUtil.parse("tel:2034567890;ext=456;phone-context=+44",
+                                           RegionCode.ZZ));
     // Full-width extension, "extn" only.
     assertEquals(ukNumber, phoneUtil.parse("+442034567890\uFF45\uFF58\uFF54\uFF4E456",
                                            RegionCode.GB));