Metadata updates for release 8.11.0 (#2414)

6 years ago · 020146544a
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 2.8.5)

 project (libphonenumber)
 set (libphonenumber_VERSION_MAJOR 8)
 set (libphonenumber_VERSION_MINOR 10)
 set (libphonenumber_VERSION_MINOR 11)
 set (libphonenumber_VERSION_PATCH 0)

 if (32BIT)
--- a/cpp/src/phonenumbers/alternate_format.cc
+++ b/cpp/src/phonenumbers/alternate_format.cc
@ -1203,112 +1203,127 @@ static const unsigned char data[] = {
  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28,
  0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32,
  0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x07, 0x5B, 0x32, 0x2D, 0x34, 0x38,
  0x39, 0x5D, 0x0A, 0xE0, 0x0B, 0x4A, 0x00, 0x50, 0x5B, 0x9A, 0x01, 0xB7, 0x03,
  0x39, 0x5D, 0x0A, 0xA3, 0x0D, 0x4A, 0x00, 0x50, 0x5B, 0x9A, 0x01, 0x8F, 0x04,
  0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
  0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x29, 0x12, 0x08, 0x24,
  0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x93, 0x03, 0x36, 0x28, 0x3F,
  0x3A, 0x5B, 0x30, 0x39, 0x5D, 0x7C, 0x31, 0x32, 0x37, 0x7C, 0x32, 0x28, 0x3F,
  0x3A, 0x5B, 0x30, 0x33, 0x36, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x2D, 0x33, 0x37,
  0x39, 0x5D, 0x7C, 0x39, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x37, 0x39, 0x5D, 0x29,
  0x7C, 0x33, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x35,
  0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x37, 0x28,
  0x3F, 0x3A, 0x5B, 0x30, 0x37, 0x5D, 0x7C, 0x31, 0x39, 0x5B, 0x30, 0x2D, 0x35,
  0x5D, 0x7C, 0x32, 0x5B, 0x30, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33,
  0x5B, 0x30, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x2D, 0x33,
  0x35, 0x36, 0x38, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x34, 0x36,
  0x2D, 0x39, 0x5D, 0x7C, 0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39,
  0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x29,
  0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x37, 0x39, 0x5D, 0x7C, 0x38,
  0x5B, 0x30, 0x31, 0x38, 0x39, 0x5D, 0x29, 0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B,
  0x30, 0x38, 0x39, 0x5D, 0x7C, 0x33, 0x31, 0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D,
  0x39, 0x5D, 0x29, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x30, 0x28, 0x3F, 0x3A,
  0x5B, 0x30, 0x31, 0x35, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x36, 0x37, 0x5D,
  0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x31, 0x5B, 0x30,
  0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x32, 0x5B, 0x32, 0x33, 0x35, 0x2D,
  0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x33, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D,
  0x7C, 0x5B, 0x34, 0x35, 0x5D, 0x7C, 0x36, 0x5B, 0x30, 0x32, 0x34, 0x35, 0x37,
  0x2D, 0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x31, 0x2D, 0x36, 0x39, 0x5D, 0x7C, 0x38,
  0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34,
  0x5B, 0x30, 0x34, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x39, 0x28, 0x3F, 0x3A,
  0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x32, 0x37, 0x2D,
  0x39, 0x5D, 0x29, 0x29, 0x7C, 0x39, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x32, 0x5B,
  0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x33, 0x34, 0x5D, 0x7C, 0x34, 0x5B,
  0x34, 0x37, 0x5D, 0x7C, 0x35, 0x5B, 0x31, 0x35, 0x5D, 0x29, 0x5B, 0x30, 0x31,
  0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x31, 0x36, 0x7C, 0x32,
  0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0xEB, 0x03, 0x36, 0x28, 0x3F,
  0x3A, 0x5B, 0x30, 0x39, 0x5D, 0x7C, 0x32, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32,
  0x2D, 0x37, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x2D, 0x39, 0x5D,
  0x29, 0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x36, 0x38, 0x39, 0x5D, 0x7C, 0x36,
  0x5B, 0x30, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x31, 0x32, 0x34,
  0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x37, 0x5D,
  0x7C, 0x33, 0x5B, 0x30, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30,
  0x2D, 0x33, 0x35, 0x36, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x28, 0x3F, 0x3A, 0x5B,
  0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x37,
  0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x38, 0x5B, 0x30, 0x2D, 0x37, 0x39, 0x5D, 0x7C,
  0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x38, 0x39, 0x5D, 0x7C, 0x33, 0x31, 0x29,
  0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x30, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x31,
  0x35, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x36, 0x37, 0x5D, 0x29, 0x7C, 0x31,
  0x5B, 0x30, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x32, 0x5B, 0x32, 0x33,
  0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x33, 0x2D, 0x35, 0x37, 0x2D,
  0x39, 0x5D, 0x7C, 0x5B, 0x34, 0x35, 0x5D, 0x7C, 0x36, 0x5B, 0x30, 0x32, 0x34,
  0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x31, 0x2D, 0x36, 0x39, 0x5D,
  0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x2D, 0x39, 0x5D,
  0x7C, 0x34, 0x5B, 0x30, 0x31, 0x34, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x39,
  0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B, 0x30,
  0x2D, 0x32, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x39, 0x7C, 0x5B, 0x36,
  0x37, 0x5D, 0x31, 0x5B, 0x30, 0x31, 0x33, 0x2D, 0x39, 0x5D, 0x7C, 0x28, 0x3F,
  0x3A, 0x36, 0x37, 0x7C, 0x37, 0x32, 0x29, 0x5B, 0x30, 0x32, 0x33, 0x35, 0x2D,
  0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x33, 0x7C, 0x37, 0x35, 0x29, 0x5B,
  0x30, 0x32, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x36, 0x28, 0x3F, 0x3A,
  0x32, 0x39, 0x7C, 0x33, 0x35, 0x29, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D, 0x39,
  0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x34, 0x7C, 0x28, 0x3F, 0x3A, 0x37, 0x39,
  0x7C, 0x38, 0x30, 0x29, 0x37, 0x29, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C,
  0x28, 0x3F, 0x3A, 0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x32, 0x2D, 0x34, 0x5D, 0x31,
  0x7C, 0x35, 0x5B, 0x31, 0x37, 0x5D, 0x7C, 0x36, 0x5B, 0x31, 0x33, 0x5D, 0x7C,
  0x37, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x38, 0x30, 0x29, 0x7C, 0x37, 0x28, 0x3F,
  0x3A, 0x31, 0x32, 0x7C, 0x38, 0x38, 0x29, 0x29, 0x5B, 0x30, 0x31, 0x38, 0x39,
  0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x31, 0x32, 0x7C, 0x37, 0x28, 0x3F, 0x3A,
  0x32, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x33, 0x34, 0x5D, 0x7C,
  0x34, 0x5B, 0x34, 0x37, 0x5D, 0x7C, 0x35, 0x5B, 0x31, 0x35, 0x5D, 0x29, 0x7C,
  0x38, 0x28, 0x3F, 0x3A, 0x31, 0x36, 0x7C, 0x32, 0x5B, 0x30, 0x31, 0x34, 0x5D,
  0x7C, 0x33, 0x5B, 0x31, 0x32, 0x36, 0x5D, 0x7C, 0x36, 0x5B, 0x31, 0x33, 0x36,
  0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x37, 0x38, 0x5D, 0x7C, 0x38, 0x33, 0x29, 0x29,
  0x5B, 0x30, 0x31, 0x37, 0x2D, 0x39, 0x5D, 0x9A, 0x01, 0xA3, 0x04, 0x0A, 0x23,
  0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D,
  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32,
  0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x12, 0x0E, 0x24, 0x31,
  0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x20, 0x24, 0x35, 0x1A,
  0xEB, 0x03, 0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x39, 0x5D, 0x7C, 0x32, 0x28,
  0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x37, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x2D,
  0x33, 0x35, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x36,
  0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x30, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C,
  0x38, 0x5B, 0x31, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x37, 0x28, 0x3F,
  0x3A, 0x5B, 0x30, 0x37, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x32, 0x35, 0x2D, 0x39,
  0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x36, 0x38, 0x39, 0x5D, 0x7C,
  0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B,
  0x30, 0x2D, 0x32, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x38, 0x5B, 0x30,
  0x2D, 0x37, 0x39, 0x5D, 0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x38, 0x39,
  0x5D, 0x7C, 0x33, 0x31, 0x29, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x30, 0x28,
  0x3F, 0x3A, 0x5B, 0x30, 0x31, 0x35, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x36,
  0x37, 0x5D, 0x29, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D,
  0x7C, 0x32, 0x5B, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30,
  0x33, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x5B, 0x34, 0x35, 0x5D, 0x7C,
  0x36, 0x5B, 0x30, 0x32, 0x34, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x37, 0x5B,
  0x31, 0x2D, 0x36, 0x39, 0x5D, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D,
  0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x31, 0x34, 0x37, 0x2D,
  0x39, 0x5D, 0x29, 0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39,
  0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x32, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x29,
  0x7C, 0x39, 0x7C, 0x5B, 0x36, 0x37, 0x5D, 0x31, 0x5B, 0x30, 0x31, 0x33, 0x2D,
  0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x37, 0x7C, 0x37, 0x32, 0x29, 0x5B,
  0x30, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x33,
  0x7C, 0x37, 0x35, 0x29, 0x5B, 0x30, 0x32, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D,
  0x7C, 0x36, 0x28, 0x3F, 0x3A, 0x32, 0x39, 0x7C, 0x33, 0x35, 0x29, 0x5B, 0x30,
  0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x34, 0x7C,
  0x28, 0x3F, 0x3A, 0x37, 0x39, 0x7C, 0x38, 0x30, 0x29, 0x37, 0x29, 0x5B, 0x30,
  0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x28, 0x3F, 0x3A, 0x5B,
  0x32, 0x2D, 0x34, 0x5D, 0x31, 0x7C, 0x35, 0x5B, 0x31, 0x37, 0x5D, 0x7C, 0x36,
  0x5B, 0x31, 0x33, 0x5D, 0x7C, 0x37, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x38, 0x30,
  0x29, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x31, 0x32, 0x7C, 0x38, 0x38, 0x29, 0x29,
  0x5B, 0x30, 0x31, 0x38, 0x39, 0x5D, 0x7C, 0x28, 0x3F, 0x3A, 0x36, 0x31, 0x32,
  0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x32, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B,
  0x31, 0x33, 0x34, 0x5D, 0x7C, 0x34, 0x5B, 0x34, 0x37, 0x5D, 0x7C, 0x35, 0x5B,
  0x31, 0x35, 0x5D, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x31, 0x36, 0x7C, 0x32,
  0x5B, 0x30, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x32, 0x36, 0x5D, 0x7C,
  0x36, 0x5B, 0x31, 0x33, 0x36, 0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x37, 0x38, 0x5D,
  0x7C, 0x38, 0x33, 0x29, 0x5B, 0x30, 0x37, 0x2D, 0x39, 0x5D, 0x9A, 0x01, 0xCB,
  0x03, 0x0A, 0x23, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64,
  0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C,
  0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x12,
  0x0E, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x20,
  0x24, 0x35, 0x1A, 0x93, 0x03, 0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x39, 0x5D,
  0x7C, 0x31, 0x32, 0x37, 0x7C, 0x32, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x33, 0x36,
  0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x2D, 0x33, 0x37, 0x39, 0x5D, 0x7C, 0x39, 0x5B,
  0x30, 0x2D, 0x34, 0x36, 0x37, 0x39, 0x5D, 0x29, 0x7C, 0x33, 0x28, 0x3F, 0x3A,
  0x5B, 0x30, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36,
  0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x37,
  0x5D, 0x7C, 0x31, 0x39, 0x5B, 0x30, 0x2D, 0x35, 0x5D, 0x7C, 0x32, 0x5B, 0x30,
  0x7C, 0x38, 0x33, 0x29, 0x29, 0x5B, 0x30, 0x31, 0x37, 0x2D, 0x39, 0x5D, 0x9A,
  0x01, 0x55, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C,
  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12,
  0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x32, 0x37, 0x39,
  0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x38, 0x39, 0x5D, 0x7C, 0x33, 0x31, 0x7C, 0x37,
  0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x38, 0x30, 0x28, 0x3F, 0x3A,
  0x5B, 0x30, 0x31, 0x35, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x36, 0x37, 0x5D,
  0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29, 0x9A, 0x01, 0xC5, 0x02,
  0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
  0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24,
  0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0xA1, 0x02, 0x37, 0x28, 0x3F,
  0x3A, 0x31, 0x5B, 0x30, 0x31, 0x33, 0x2D, 0x39, 0x5D, 0x7C, 0x32, 0x5B, 0x30,
  0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x32, 0x35, 0x2D,
  0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x36, 0x38, 0x39, 0x5D,
  0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x36,
  0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B, 0x30,
  0x2D, 0x32, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A,
  0x5B, 0x30, 0x2D, 0x37, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x31, 0x38, 0x39,
  0x5D, 0x29, 0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x38, 0x39, 0x5D, 0x7C,
  0x33, 0x31, 0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C,
  0x38, 0x28, 0x3F, 0x3A, 0x30, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x31, 0x35, 0x38,
  0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x36, 0x37, 0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x32,
  0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x35, 0x37, 0x2D, 0x39,
  0x5D, 0x7C, 0x32, 0x5B, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B,
  0x30, 0x33, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x5B, 0x34, 0x35, 0x5D,
  0x7C, 0x36, 0x5B, 0x30, 0x32, 0x34, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x37,
  0x5B, 0x31, 0x2D, 0x36, 0x39, 0x5D, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30,
  0x2D, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x34, 0x37, 0x2D,
  0x39, 0x5D, 0x29, 0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39,
  0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x32, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C,
  0x39, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x32, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x33,
  0x2D, 0x32, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x37, 0x7C, 0x38, 0x5B,
  0x30, 0x2D, 0x37, 0x39, 0x5D, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x31, 0x5B,
  0x30, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x32, 0x5B, 0x32, 0x33, 0x35,
  0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x33, 0x2D, 0x35, 0x37, 0x2D, 0x39,
  0x5D, 0x7C, 0x5B, 0x34, 0x35, 0x5D, 0x7C, 0x36, 0x5B, 0x30, 0x32, 0x34, 0x35,
  0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x31, 0x2D, 0x36, 0x39, 0x5D, 0x7C,
  0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C,
  0x34, 0x5B, 0x30, 0x31, 0x34, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x7C, 0x39, 0x28,
  0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x2D,
  0x32, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x37, 0x28, 0x3F, 0x3A, 0x31,
  0x32, 0x7C, 0x38, 0x38, 0x29, 0x5B, 0x30, 0x31, 0x38, 0x39, 0x5D, 0x7C, 0x28,
  0x3F, 0x3A, 0x37, 0x28, 0x3F, 0x3A, 0x32, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x33,
  0x5B, 0x31, 0x33, 0x34, 0x5D, 0x7C, 0x34, 0x5B, 0x34, 0x37, 0x5D, 0x7C, 0x35,
  0x5B, 0x31, 0x35, 0x5D, 0x29, 0x5B, 0x30, 0x31, 0x37, 0x2D, 0x39, 0x5D, 0x7C,
  0x38, 0x28, 0x3F, 0x3A, 0x31, 0x36, 0x7C, 0x32, 0x5B, 0x30, 0x31, 0x34, 0x5D,
  0x7C, 0x33, 0x5B, 0x31, 0x32, 0x36, 0x5D, 0x7C, 0x36, 0x5B, 0x31, 0x33, 0x36,
  0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x37, 0x38, 0x5D, 0x7C, 0x38, 0x33, 0x29, 0x5B,
  0x30, 0x37, 0x2D, 0x39, 0x5D, 0x9A, 0x01, 0x55, 0x0A, 0x15, 0x28, 0x5C, 0x64,
  0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C,
  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20,
  0x24, 0x33, 0x1A, 0x32, 0x37, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x38, 0x39,
  0x5D, 0x7C, 0x33, 0x31, 0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29,
  0x7C, 0x38, 0x30, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x31, 0x35, 0x38, 0x39, 0x5D,
  0x7C, 0x36, 0x5B, 0x36, 0x37, 0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x32, 0x2D, 0x39,
  0x5D, 0x29, 0x9A, 0x01, 0xBF, 0x02, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33,
  0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
  0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33,
  0x1A, 0x9B, 0x02, 0x37, 0x28, 0x3F, 0x3A, 0x31, 0x39, 0x5B, 0x30, 0x2D, 0x35,
  0x5D, 0x7C, 0x32, 0x5B, 0x30, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33,
  0x5B, 0x30, 0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x2D, 0x33,
  0x35, 0x36, 0x38, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x34, 0x36,
  0x2D, 0x39, 0x5D, 0x7C, 0x36, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39,
  0x5D, 0x7C, 0x31, 0x5B, 0x30, 0x2D, 0x32, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x29,
  0x7C, 0x37, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x37, 0x39, 0x5D,
  0x7C, 0x38, 0x5B, 0x30, 0x31, 0x38, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x38, 0x28,
  0x3F, 0x3A, 0x31, 0x5B, 0x30, 0x2D, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x32,
  0x5B, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x33, 0x2D,
  0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x5B, 0x34, 0x35, 0x5D, 0x7C, 0x36, 0x5B,
  0x30, 0x32, 0x34, 0x35, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x31, 0x2D,
  0x36, 0x39, 0x5D, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x2D, 0x32, 0x35,
  0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x34, 0x37, 0x2D, 0x39, 0x5D, 0x29,
  0x7C, 0x39, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x31,
  0x5B, 0x30, 0x32, 0x37, 0x2D, 0x39, 0x5D, 0x29, 0x29, 0x7C, 0x37, 0x28, 0x3F,
  0x3A, 0x32, 0x5B, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x33, 0x34, 0x5D,
  0x7C, 0x34, 0x5B, 0x34, 0x37, 0x5D, 0x7C, 0x35, 0x5B, 0x31, 0x35, 0x5D, 0x29,
  0x5B, 0x30, 0x31, 0x37, 0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x31,
  0x36, 0x7C, 0x32, 0x5B, 0x30, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x32,
  0x36, 0x5D, 0x7C, 0x36, 0x5B, 0x31, 0x33, 0x36, 0x5D, 0x7C, 0x37, 0x5B, 0x30,
  0x37, 0x38, 0x5D, 0x7C, 0x38, 0x33, 0x29, 0x5B, 0x30, 0x37, 0x2D, 0x39, 0x5D,
  0x9A, 0x01, 0xB3, 0x01, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
  0x5B, 0x31, 0x35, 0x5D, 0x29, 0x7C, 0x38, 0x28, 0x3F, 0x3A, 0x31, 0x36, 0x7C,
  0x32, 0x5B, 0x30, 0x31, 0x34, 0x5D, 0x7C, 0x33, 0x5B, 0x31, 0x32, 0x36, 0x5D,
  0x7C, 0x36, 0x5B, 0x31, 0x33, 0x36, 0x5D, 0x7C, 0x37, 0x5B, 0x30, 0x37, 0x38,
  0x5D, 0x7C, 0x38, 0x33, 0x29, 0x29, 0x5B, 0x30, 0x31, 0x37, 0x2D, 0x39, 0x5D,
  0x9A, 0x01, 0xC0, 0x01, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
  0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D,
  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x8F,
  0x01, 0x37, 0x28, 0x3F, 0x3A, 0x31, 0x39, 0x5B, 0x30, 0x2D, 0x35, 0x5D, 0x7C,
  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x9C,
  0x01, 0x37, 0x28, 0x3F, 0x3A, 0x31, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x31, 0x33,
  0x2D, 0x39, 0x5D, 0x7C, 0x32, 0x5B, 0x30, 0x31, 0x38, 0x39, 0x5D, 0x29, 0x7C,
  0x32, 0x5B, 0x30, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30,
  0x32, 0x35, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x36,
  0x38, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x32, 0x2D, 0x34, 0x36, 0x2D, 0x39,
--- a/cpp/src/phonenumbers/lite_metadata.cc
+++ b/cpp/src/phonenumbers/lite_metadata.cc
--- a/cpp/src/phonenumbers/metadata.cc
+++ b/cpp/src/phonenumbers/metadata.cc
--- a/cpp/src/phonenumbers/short_metadata.cc
+++ b/cpp/src/phonenumbers/short_metadata.cc
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/218_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/241_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/353_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/358_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/39_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/682_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/82_ko
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/386_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/673_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/679_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/682_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/971_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
--- a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV