diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
index 1366ecb42..f50c244be 100644
Binary files a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config and b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config differ
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 89323d566..9639bbdb1 100644
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255
index 7c4f9daaa..7e32b2bbe 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27
index 5ab6d03fe..a8394f754 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30
index 4f6f50a55..cfd7b3798 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31
index 1999488ed..82340deb8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34
index 7c60d3d6b..d0703f812 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350
index e857d20ee..1ea3d71f7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351
index bd077e771..bffda86f2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352
index 7ee05e92e..79b39e11d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358
index dc7a5d136..83951fb5f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359
index 6431d101c..fb48aa627 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36
index 9284fb16f..0994e0dbf 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372
index a16f968bd..3f3689ce1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373
index 6932076fe..b9d0f47d6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380
index ef9632768..7bd530d8d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381
index 37654d463..b98f0b399 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385
index c6d79133e..a2f2fbe39 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43
index 48addfeb5..cab13d8a1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44
index 4864eeb67..a5cdfdc31 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49
index 54cc030ab..aca98ea6b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505
index f8b78ffb6..437160a4b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506
index 1987a239f..4be381665 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54
index c401bf932..fcd3a3761 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55
index a20759525..490569e32 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58
index da9513985..07bd92e01 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595
index 8f4dfc664..a2563d382 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61
index 7a0a3b810..2ff5a990f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62
index 8763d3c01..3c0414653 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63
index 84f5a53cc..0c434d18e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66
index bcf3abb93..3f59b7b57 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675
index 52d0a37d6..b28f198e1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
index e7f5f11dd..b9a02bc58 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679
index 15209d249..f79963733 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7
index 5d72f0be5..74eba0dff 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81
index efe9684bb..595253376 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84
index 5c7723323..bae5eaa23 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855
index e231e9d59..8dc04dbd7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90
index 947507123..531b6e2c7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
index f63b8ecf8..319d6211d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94
index 69584350e..931b3e54a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95
index a672784f4..50afc445e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971
index 31d4fe03d..1cf408c71 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972
index 01d2cb9f2..6bdc92c46 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995
index 81d6f13b5..6e21214a8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
index 03c5f19e1..c8d5ffa4a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808
index 683e159ee..d17c8d620 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870
index 954e72b70..e8c082bdb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878
index f6eaf0aae..d58df5641 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
index d750a33e4..ea9ef7ece 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882
index a6e6f4496..ca49ff010 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883
index cc8cc35c0..88b8a5aec 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888
index 11a52b1e8..0cd763b91 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979
index 5fb8fb580..0929b3fec 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC
index 8ad87f57b..c1878bd83 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD
index 24d4d0012..bfac1112c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
index 33d770f65..3fed6695d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF
index 01af03449..a34ad96ad 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG
index 6140377e9..79a8bb2dd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI
index 61bd02283..4efdfca48 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL
index 54228be85..aa2ab6d85 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
index 3c6b31bc4..38daaa1c5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO
index fe65c05ea..133a93b22 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index a683ee7e8..e8d3d9c8f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS
index 5289438af..c1cd7dcb0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT
index 2feb3835d..3529c9dd0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU
index 5011c61ae..e638ddf47 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW
index a7b06e98a..bea4677da 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX
index 8de12c465..3a0163b98 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ
index 11ee8681c..32fcc1aec 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA
index b3ed0bbfb..9f7ced8aa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB
index fc193d58b..f9ee806db 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD
index 06bbe4138..b33a101e2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE
index d7ff507df..9cab9756b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
index 40c84bd2e..1265ae9c5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG
index 6e9cfe3d2..bda399003 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 4ccb0597e..7700513cd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI
index 26aaa6562..998d4517a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ
index 290ec5806..ed13585dc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL
index 94ba050e9..25c831865 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM
index 0bef470ff..e4adeaa60 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN
index cffdb8b6f..b8d90015e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO
index 021c2274b..a17a92b62 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ
index 62f35c249..7825f44e7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR
index 7f0fa9b97..0d5f37ac0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS
index 7b32289d9..32e7b40e7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT
index e98b41a40..7c4944f6a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW
index d0d2839d3..308c30f8d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index 03bd17fc7..63c206288 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ
index 831e72132..f6ad5c1aa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
index fa4308c32..c221c9a95 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC
index 4d94ee042..07f53902e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD
index b52fcca42..cf0004f01 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF
index af5164992..456b2a34f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG
index b3c50cddb..f1cb4eb75 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH
index 6449451e4..144c6ebe2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index ecc5a52a5..e7861558a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK
index c084b84ce..eb37bb19d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL
index 8ef705357..21f89d882 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM
index b4d0437b6..8d458be22 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index f09a60199..6c3815b7f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO
index b86a88f7a..eba5a7bd8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index 141362d24..f2739f329 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU
index fedae5269..388366431 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV
index 0544c71f5..bea6d98a2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW
index c72f5590b..434e501d7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX
index 4462c5bac..32b40bb52 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY
index 49fc85446..3a1bde24d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ
index 297fbe4d2..4003d75a4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
index f7030e8cc..fbaad08df 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ
index a9d3ddf88..3a2804da1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
index bd3a9d409..0f0a954cc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM
index 459a0f23a..76cced164 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO
index 8a4dace50..5c0fcc410 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ
index 24d59b450..93eb0325c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
index 7d1eeccaa..9beb7d23b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 8f1881a64..45c53c651 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG
index 7511ce67d..f98dde259 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
index 47acce07c..548401222 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER
index 0e1f43a81..b9f7028c0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES
index 1e8c2384e..f31856ef3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
index cbf1c4c86..eb82d5a86 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI
index 44d04e057..544489166 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ
index fe9f621ec..17da10546 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK
index 7343c2847..0b8ff8f19 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM
index 714e46498..ec4f6344f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO
index 2fdbbfb8e..2a3c8a42d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR
index 3c17f9ae8..c27b0079c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA
index ffaca37a0..8513d528c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index c409f1245..d31f48082 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD
index 9849e7488..9e63dc377 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE
index 62d6dacc2..275484088 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF
index 494984c75..76ea09d73 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index eb89ae694..17aa02e38 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index 410c1b46e..6f2a0887e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI
index 58279c9cc..3fef30178 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
index 4a9150e66..b9c885aac 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM
index bd678000b..2e8d03a47 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN
index b975a1d42..357c2f029 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP
index ca0192bb5..8799e47fe 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ
index 13942357c..bed4f1815 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR
index c9c43ddc9..010b08f0c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT
index cb729cd24..0e66b7fa3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU
index 78a606de7..dfa9d6ff4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW
index 733a8d3e5..737b6ebdb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY
index a7b2ae134..6efcfab6b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK
index a9d20fe7b..aa348cb1e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN
index b1bc5d107..db2d48327 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR
index 10b088456..8aab20bb9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT
index 75b17c185..c8d1d5faa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU
index 1241b4962..ae834a8a9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID
index d9a2c0d73..55a869ba8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE
index 9db8f6efa..09746144b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
index 9e24745ec..aab40f274 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 216267c03..d03d54b9b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN
index 07108525b..68b78c8f0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO
index a6caa036b..7a0aff30a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ
index 5436f0abc..e0ce0c2b0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
index 610367e9c..1f4aa7c23 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS
index ece7eb7e7..30f588574 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT
index 09988e644..d40afaeaa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index 15be96b23..8252564ca 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
index c95a0e2dc..d6a925186 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index 249342435..a06b3de73 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 19f058b08..3018755c9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
index 9c28eb51d..3f090b0f2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG
index 08b017536..90c99e5d9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH
index 0fbc7d138..d613ba53e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI
index 1be3aa87a..bc414465b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM
index ab70e5ca5..f77db7321 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN
index e185e763c..e8954c797 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP
index 2713b6c31..ed9ca6d6f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index 200201ea5..aea135bbf 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index a71a1ed25..11e2f67c2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
index eb8f95948..83ca972ae 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ
index 3ca2463a5..d27d765f0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index 2b9000170..77b03c300 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB
index 17e48d67d..e581024e9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC
index b36be6b67..692182544 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI
index 2b67e52ef..de0a7f324 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK
index 1d3d9d5e2..5229b08cf 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR
index 71fb17636..e74f064f5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS
index 7bec656bf..51e44360b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT
index d9c46a38f..293e570ec 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 77c48b991..1a6159a5c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV
index a0a53af26..aff0d8ac9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY
index 2616120b1..87d5b7b66 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
index e8fd6b806..e5b1d248f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC
index 8a7a7a236..7b21de820 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD
index e5999906c..0e181e2e2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index 1fe1d4d62..c4752c7a3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF
index 7a8f91733..85534b98e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
index 8599673bc..7c1109eeb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH
index 1f20fa6b4..fe2f8eee5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
index 95ebb1444..6d067e524 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML
index b14c8bb61..f3da8d515 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
index 8c14bed6b..9e363b335 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
index 5be9de474..7922cfd1a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO
index 04bbe12cd..8560e0f02 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP
index e0cbcf92c..b803a457b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ
index 078585957..da0b5691e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR
index 89c57276a..6b3891e9b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS
index 9cc976395..c36235441 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT
index 8375e5f60..9f4ff69e5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
index 657c97a5d..896744007 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV
index 1e578a8e5..1864b4a0e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW
index f46056204..e10d74a43 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX
index 7fbee8728..267bd7298 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY
index 80ffa2e5c..3c3a91333 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ
index 65b2f1f1d..ba7d76226 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA
index 8c6eb64da..dec787d88 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC
index 6f3083ab0..b4a00fc04 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE
index c693ec922..ca1b8809d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF
index d4f230ad7..2b8d8ca1c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG
index 862188eb7..86ca045ad 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI
index fd6a7c13a..a346663a6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL
index b9c52db02..e74d23ec5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO
index 71d187a3f..643ca914f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP
index 262fafda5..495b38644 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
index 7f9f74f42..ae7cff03e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU
index be8fe3671..2e2af52a6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index b980f3ffb..2280bf83f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM
index fbb49266f..e2ab69d91 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA
index 640f3eea0..4ca001e5f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE
index 2c9bbc5b9..7130c2733 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
index b1536f4cf..6d78c6aff 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG
index ab342f6bc..b9e655458 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH
index e27c62fe3..c0cf3643c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK
index d1d890441..ebc0d9135 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL
index f05266ba9..ee40a8310 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM
index df14f84a9..3b54a7419 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR
index 7ce02f203..8c2536538 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS
index 821f17a32..3f0114950 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT
index 1891fc52d..e0478c033 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
index 3a01a2569..ed6d82976 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY
index 298e973c6..3b44fa5c2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 24c888699..3394f13d0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE
index 8a1cb9ee8..26dd0c45a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index 903dec156..01c62cafa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS
index 06de92e5d..709b19be4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU
index c769356a1..3d7643d8d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW
index a6d7a1487..2440e11a7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA
index 48930210c..f60c95d02 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
index 39d1ebc2d..860a62f7f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC
index 630669823..0b8c108fb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD
index e85a1981a..a483c1ec9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE
index 626fb0ec7..d8eea8bad 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
index 49bd8d0c6..1c0e6a2c3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH
index 2c21c2ef8..c8d6f8237 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index a2607df1c..bef5d0edb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ
index 4ca427378..2a0064246 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
index 19642c6bf..6c38f1355 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL
index 4bf98c4a4..f2f231b90 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM
index 4294cf93b..6c2df8f2b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
index 9cfc22eb2..83fe3a164 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
index f3255a883..bf98eef5e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR
index 7ea63edd7..9d3d88e54 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS
index 86e0518de..d6ab39367 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST
index d36d1553d..1736256be 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV
index d16669741..fbc8cd620 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX
index 472486a22..2aec6f272 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
index 7f03a188d..f61fd9d94 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ
index d26ba68da..3fccaea90 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA
index 769f6f09b..5359335c6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC
index 409fe598d..b5c462909 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
index c87d8b57b..7e03d0878 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG
index 0e90dbc19..cd6d88dfd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index b2f44e258..415a87d33 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ
index 02a73f61f..43b8accbd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK
index e20bb98de..3b216e7ef 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL
index 11fd5af0f..2afdf5629 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM
index 065034d30..3daf5fa11 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
index a6441e8da..70d4b1b63 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO
index 29d6dee55..fe9ea53ff 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR
index 19d2338e0..55d9cdd12 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT
index 620596835..b9752d84f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV
index ca2e8b86b..c9771d032 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW
index de246f5e5..77446e35a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ
index 2f4527a83..e520fee38 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA
index 1995a3004..af44a6ba5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
index 12d16a918..99a51557d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
index 04521e581..110d41083 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY
index e2f738868..34677205f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
index 1711a97c5..38273b627 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA
index fa28bc479..e9484d119 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC
index 551e326ef..a72e5b003 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE
index 5e3db17e7..a1a3ad93e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 28f0f02eb..0f78a3e22 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI
index 8454793ea..76c2d10b1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN
index 0fd97d473..55c5d6c87 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
index f883189fb..818cca847 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
index a0801df4a..79fea91c8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index fb630c2ec..73fdc7603 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
index 24f3bd2a3..88b4749af 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
index f09bf95bb..1dc3dd414 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
index 8598631a1..a0ba8112d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
index 0ba0feefd..e1d554453 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW
index 078163298..0b35a04d5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC
index 0fb368e11..74ffcdccd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD
index fe5340335..f24df3350 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE
index fb4894dd2..fbcfefc9e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF
index 6ea72a59f..3788b26da 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG
index d1b952a8b..78ae869f3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI
index d0cf967c9..e7e5bff1e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL
index b89482919..8ea4ce803 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM
index 40ae751f8..635229383 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO
index 2b7b54505..310df7fa5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR
index 4b38d722a..8a9daf158 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS
index 3a15688fa..a27ffe7fb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT
index 946641be0..a1ba715d4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU
index 8a14d4f8a..d209247b5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW
index 933e7cca1..f3ffda49f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX
index a52bc978e..565fcb51d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ
index 797d52948..c3a7dc4ee 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA
index c1c073c13..33520ea13 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB
index ed13a1df3..269b75bf7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD
index 18b734450..a1983cfb1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE
index 39091613d..3701ff683 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF
index 2cb5251ca..bd050b340 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG
index a454f3b82..f5a4ab787 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH
index 4d857280b..662b7ae20 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI
index 3ed554e6d..5b3dec4a0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ
index 153ec9ecb..3d5f8aafa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL
index 3e4866ec6..2f404c381 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM
index 155b7d520..b373c206b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN
index 37ee404a5..02cabe072 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO
index 7a01bf81d..22e773306 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ
index d3b876e32..a29dd56cb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR
index 5d2d656ba..8072ac7ec 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS
index aa460ff6a..66388d79f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT
index b40465023..7f14406ef 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW
index 85fdfc0b4..976050399 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY
index 49bf8ab9a..8c7e33c8f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ
index bbd87bf7b..4609c0322 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
index 87c09c947..60321f54b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC
index 0a5f67515..9f460e27e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD
index 60aacaf8e..cdc47655e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF
index a2c4c037b..13be56cbc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG
index 91065b5cf..a87dfd0c5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH
index 821281fe9..fc732e0b2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI
index 81f7dccc1..0b01c4ace 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK
index 3c396905b..2a9df3f2a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL
index ecaa04f1f..6ace01af1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM
index 8df38012a..e03b68f72 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN
index 98054ff0c..557fcdd55 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO
index 0c4eff1b6..890d0df99 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR
index 3411d7f19..d31a37146 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU
index ea834cb82..e6f3a6ab1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV
index 783da2e73..d751c2d64 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW
index 571875026..638e4ea3e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX
index ce8b75d87..584ed683b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY
index c5962d388..6af1615bb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ
index 4a644f3c7..403898478 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE
index 8fe45dd36..3d1eab677 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ
index 8825c8b27..9570d9ae2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK
index 7cdaea8f3..ea99b412b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM
index 1a3604dd9..2937e9f9c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO
index 34432f163..02548a8d5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ
index 2a1c8a7c8..fffe170b4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC
index 47142711a..dffb0c4e1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE
index 6ca452dd1..d864b0bfc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG
index 8638f07e2..16f946aef 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH
index 87c38a918..157e30193 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER
index 439d23048..bd31d1a7b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES
index e086ffa1f..9e3328720 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
index e0594080a..992d15f9f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
index 4982038a9..60a01c388 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ
index 2f2665e43..105990eaf 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK
index 349ebe6c6..d06ee70a6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM
index 24fba7ce4..c02c67606 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO
index f0901ac2d..1032654b2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
index b91acd629..93e542540 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA
index 958d8e992..253da0992 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB
index 8be70a07c..317d04729 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD
index 208a7a780..42f73e843 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE
index fb236a77b..0f0354812 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF
index d35588db5..d064d4b73 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG
index ac2846538..525a43abd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH
index 9a8a4721f..b58fcf3db 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI
index c494df98b..1ec43e299 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL
index 177d6fdb6..5d89ce582 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM
index c890061a6..45580ca63 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN
index 6e2b7c9a3..d29e28c52 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP
index d199bed2e..0495da145 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR
index 1f9b0b12d..8cc103d7e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT
index 53c1c04fa..ad158a95c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU
index 97b9bef49..0f9719209 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW
index e2966942b..2cdaa3ce7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY
index 0a64e1c7d..727fd90cb 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK
index 6d67cb656..ae9d33756 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN
index cd8a21087..dcfa8e596 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR
index 08316ca71..e8f556a98 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT
index 6eedab01f..f20c95674 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU
index 46498f6d9..945f08ea5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID
index 630d89bd6..44c6273a3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE
index 5db571af9..998b514e8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL
index 13567974f..cf44a7c75 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM
index 51af3cd39..0f4866503 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN
index 323d45c52..5672dc75c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ
index 5a711cbf0..a2b3e7de6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR
index f2b7611d9..8ac0ca5b0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS
index d9d473b70..9236e3927 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT
index b4fb32155..3ac84c831 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE
index 918ae8ce8..f1e1f5ba9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM
index 865b0ce8a..f531f3f51 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO
index e7afad28e..60606743e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP
index a881213d6..0a41f2bdc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE
index 31013f9f8..67c238211 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG
index be9ba9917..645409a9d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH
index f92e2c38a..357e193f6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
index 589426901..ad6ff09d6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM
index 282b9aff7..f007b0b5f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
index 11f927b7c..bed22feb9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP
index 25823d111..e0108aa97 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
index 2beffe37c..3fbdd5f62 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW
index a492b005b..b8d7ba7bc 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
index 2c7fa884b..2021fd6c0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ
index 19f3e541b..fdd15244a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA
index fae89ce2a..a0db8e735 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB
index 825a9ee10..461f7853e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC
index a26db8782..dccb21459 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI
index 6817a85bd..75cbf63c8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK
index 4c5e71245..f7a3bf539 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR
index 8d7a29ac1..865909b2c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS
index 3819b4315..1402e1b37 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT
index 8148ca742..ccbb9ec5d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU
index f099c4baa..f645a0b62 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV
index e6d922f26..44dc3efb6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY
index f389f9c23..da6addd4f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA
index a00d409da..b72a0cb9e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC
index eae7953bc..40b9d7bb3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD
index 41b3e576f..54c4b90b6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME
index e9d5f1d03..7fd5a28b2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF
index e6ee4a2e0..b1fa010c5 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG
index 203b7250e..9fb191b32 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH
index a3e55bea4..c0c096003 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK
index 3702ec24c..cf8e304e1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML
index eb61dd4a7..21b14db7d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM
index 7016f3261..22ea7224c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN
index 097cbbb16..5ab339b8d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO
index 623e577da..d15283249 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP
index 2f4a6b6cd..a34c3f040 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ
index 690367fbb..f6ec8c751 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR
index 8e8d9922e..e2c2542b7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS
index 083f7fd45..38fb6c948 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT
index f83454975..da74fb9ad 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU
index a37fec1be..ab8083e6d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV
index aeb03dd49..95dc6e3ab 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW
index 8efd2c574..91bafccdf 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX
index c5fa87e8f..dc5de200a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY
index 5c25f4ae7..e49f8113b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ
index fd9a38b22..fbd9affe2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA
index 24dbfc46a..e86b9ceb6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC
index 3a5068779..2c5389155 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
index 04d35ff80..d771aa153 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF
index 65ca9ae5e..469c0aa3d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG
index d6c02c304..4765e5747 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI
index 27e561390..0e6442472 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL
index 01dcf65b7..8f2233844 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO
index e6ff93566..823189041 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP
index f937cc8a8..f4b2a097e 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR
index 4b6a0e430..5a471fd32 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU
index 678a2827c..e225d9253 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ
index 70f10e15f..ab3f5254c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM
index 76832fd91..01fb50d53 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA
index 2358ea754..fbcf2983b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE
index 819a123ac..d52f09dd7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF
index 91a65ed22..2bc0ee23b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG
index 7d51ac94b..db09b2bf9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH
index ef96a5a64..c89463ca1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK
index 678f4875b..f0aa8a425 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL
index ae1b62011..5428db80b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM
index ad1e7663d..f4adb431f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
index bfefb4b18..0b237f005 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
index ea10c6acf..9e15be79c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW
index a9f829433..c6440cd8d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
index 9bdea25c8..b5930495f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA
index 9a704435e..574a4f464 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE
index 1be529fef..924f8388d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO
index 4cc39ab07..eebf1650c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS
index 28af24463..85048861f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU
index d0a711bb9..71da75317 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW
index 6319123bd..1f02df865 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA
index dc227c709..1af3a30d2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB
index 4035fa337..f067ce049 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC
index be38ce857..983acb84f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD
index 27a91d478..193fe6b7c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE
index d10dc1431..4dba0dae7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG
index 18f181305..3b2ddf5b0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH
index 559091cbe..e7bf39ca0 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI
index 0722842b1..10ec0c121 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ
index 72e937d80..71d22bdac 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK
index ab81e665f..867bd3679 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL
index 9a3e13989..f4270f181 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM
index f7c73f148..9957c8fa2 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN
index cb8ecc014..a5cd1c3a6 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO
index 08103b284..c5f6cdbd8 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR
index 16c246031..e7bae5d46 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST
index 51d2a9aa0..097b246b4 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
index 4c26fe4b2..4b1f16d92 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX
index 297cb68b3..afa6a860d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY
index 009ec93d1..b2118eb92 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ
index 7e5eb9faf..fa0cba520 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC
index 818bc0ace..3f9db4254 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD
index ff036a2fb..96aa8a11a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG
index e2d5c2852..16ed6c702 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH
index 60bd59bd6..11b3296e1 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ
index 954c0f809..51a8727fd 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL
index 1beee2593..1dabb4172 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM
index 83d453f2c..ded3a7c10 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN
index 7277d419e..992b3718d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO
index 735b30b05..5a36936e9 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR
index c24e45d3a..1bb44352d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT
index c68094ebd..1c67e2b46 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV
index 05f763fa2..c02c40212 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW
index ae2529404..846f0185a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ
index 44f79df00..0c67e6739 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA
index 9603cb816..58a31df28 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG
index 78128a286..b7b683998 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US
index 9b23ccdb7..5b5cd668f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY
index d0e5e72b7..7dc561d56 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ
index 15f91a78b..febccc903 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA
index 8c2d76b7e..a170b283b 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC
index f91a7f528..b5b54580a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE
index 721c0ef37..e9a731ec7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG
index edea90f2a..aac109baa 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI
index 56cce8c06..5e6e6df8a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN
index d315c602f..136a0772c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU
index 6f9df3b72..a6ab9eea3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF
index 973769fc2..fc5bcb22c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
index eaee6b8ca..686c18930 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE
index e5066d435..dcdd8dfa3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT
index cb112c993..60a6a334c 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA
index f0afb76d4..2e639e00a 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM
index db15bda8e..f0e5edbd7 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW
index ab6a58eac..77fcbd623 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto
index 412d7c912..4d0dd8f35 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800
index 03c5f19e1..c8d5ffa4a 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979
index 56897b27f..87e983592 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD
index ace04c194..fd2844b89 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE
index bc2e8d8e8..de5efa3be 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO
index c306e0379..7865c2f55 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR
index 7d7fb24d2..c9c1af82d 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU
index 44da9cfd7..734279b1d 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB
index 672f42b17..fc3a7156e 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR
index c0f70683d..8bf34a1dc 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS
index b9c6f2281..443033c72 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY
index 706d64ed4..d89232d98 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA
index a169c934b..464bd029f 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC
index 97fa27e94..2462f4c12 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN
index 9741b32e4..b8329393f 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX
index 334390d49..92a95820c 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE
index c6835b763..e3797a487 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR
index db0a6b39a..ece939dbe 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB
index cc39b9e21..9e8ecc452 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG
index 32a4d0d0b..712f683de 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU
index d10ef0351..28fdec1d8 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT
index fb81fe0c9..d3c00b2f7 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP
index 698c404b8..aa055b199 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR
index 5c3884358..49e83020a 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX
index ff509e760..cd4593a94 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
index fee7982c6..9a26ed1e9 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
index 52b0c5a02..7c5fc15ba 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
index 7bb4228d0..144938cee 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE
index c9643cdcc..99fdf26f8 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
index b97c68125..fa3128512 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
index 6058300b6..a24d33bb8 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
index fa8356d75..0852976e8 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting
index 1ddfc3afe..cfb5f7fb5 100644
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting and b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting differ
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
index 41155472e..bc36b06d0 100644
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@@ -274,9 +274,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AD",376,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1 $2",["[346-9]"]
-,"","",0]
+]
 ,[,"(180[02])(\\d{4})","$1 $2",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -292,13 +292,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AE",971,"00","0",,,"0",,,,[[,"([2-4679])(\\d{3})(\\d{4})","$1 $2 $3",["[2-4679][2-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([479]00)(\\d)(\\d{5})","$1 $2 $3",["[479]0"]
-,"$1","",0]
+,"$1"]
 ,[,"([68]00)(\\d{2,9})","$1 $2",["60|8"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -314,7 +314,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AF",93,"00","0",,,"0",,,,[[,"([2-7]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[2-7]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -356,13 +356,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{8}",,,"70012345"]
 ,[,,"NA","NA"]
 ,"AL",355,"00","0",,,"0",,,,[[,"(4)(\\d{3})(\\d{4})","$1 $2 $3",["4[0-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6[6-9])(\\d{3})(\\d{4})","$1 $2 $3",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2358][2-5]|4[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,5})","$1 $2",["[235][16-9]|8[016-9]|[79]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -378,13 +378,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"60[2-6]\\d{5}","\\d{8}",,,"60271234"]
 ,"AM",374,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",["1|47"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{6})","$1 $2",["4[139]|[5-7]|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["[23]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["8|90"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -399,7 +399,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"AO",244,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"AO",244,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -415,30 +415,30 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{3})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$2 15-$3-$4",["911"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$2 15-$3-$4",["9[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})","$1",["1[012]|911"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$1 $2 $3-$4",["911"]
 ]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
@@ -446,11 +446,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3-$4",["9[23]"]
 ]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
-,"0$1","",1]
+,"0$1",,1]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"810\\d{7}","\\d{10}",,,"8101234567"]
@@ -479,17 +479,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"780\\d{6,10}","\\d{9,13}",,,"780123456"]
 ,"AT",43,"00","0",,,"0",,,,[[,"(1)(\\d{3,12})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3,5})","$1 $2",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{4})(\\d{4,7})","$1 $2 $3",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,10})","$1 $2",["316|46|51|732|6(?:44|5[0-3579]|[6-9])|7(?:1|[28]0)|[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3,9})","$1 $2",["2|3(?:1[1-578]|[3-8])|4[2378]|5[2-6]|6(?:[12]|4[1-35-9]|5[468])|7(?:2[1-8]|35|4[1-8]|[5-79])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -505,21 +505,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"500\\d{6}","\\d{9}",,,"500123456"]
 ,[,,"550\\d{6}","\\d{9}",,,"550123456"]
 ,"AU",61,"(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88))?001[14-689]","0",,,"0",,"0011",,[[,"([2378])(\\d{4})(\\d{4})","$1 $2 $3",["[2378]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[45]|14"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(16)(\\d{3})(\\d{2,4})","$1 $2 $3",["16"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[389]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:[38]0|90)","1(?:[38]00|90)"]
-,"$1","",0]
+,"$1"]
 ,[,"(180)(2\\d{3})","$1 $2",["180","1802"]
-,"$1","",0]
+,"$1"]
 ,[,"(19\\d)(\\d{3})","$1 $2",["19[13]"]
-,"$1","",0]
+,"$1"]
 ,[,"(19\\d{2})(\\d{4})","$1 $2",["19[67]"]
-,"$1","",0]
+,"$1"]
 ,[,"(13)(\\d{2})(\\d{2})","$1 $2 $3",["13[1-9]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"16\\d{3,7}","\\d{5,9}",,,"1612345"]
 ,1,,[,,"1(?:3(?:\\d{4}|00\\d{6})|80(?:0\\d{6}|2\\d{3}))","\\d{6,10}",,,"1300123456"]
@@ -534,7 +534,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"28\\d{5}|501\\d{4}","\\d{7}",,,"5011234"]
-,"AW",297,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"AW",297,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -563,11 +563,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AZ",994,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["(?:1[28]|2(?:[45]2|[0-36])|365)"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -583,11 +583,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BA",387,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2-$3",["[3-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["6[1-356]|[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["6[047]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -616,13 +616,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"96(?:0[49]|1[0-4]|6[69])\\d{6}","\\d{10}",,,"9604123456"]
 ,"BD",880,"00[12]?","0",,,"0",,"00",,[[,"(2)(\\d{7})","$1-$2",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4,6})","$1-$2",["[3-79]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3,6})","$1-$2",["1|3(?:0|[2-58]2)|4(?:0|[25]2|3[23]|[4689][25])|5(?:[02-578]2|6[25])|6(?:[0347-9]2|[26][25])|7[02-9]2|8(?:[023][23]|[4-7]2)|9(?:[02][23]|[458]2|6[016])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,7})","$1-$2",["[3-79][2-9]|8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -638,13 +638,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BE",32,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["4[6-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[23]|4[23]|9[2-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[156]|7[018]|8(?:0[1-9]|[1-79])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["(?:80|9)0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -659,7 +659,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BF",226,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BF",226,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -675,21 +675,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{5,9}",,,"70012345"]
 ,[,,"NA","NA"]
 ,"BG",359,"00","0",,,"0",,,,[[,"(2)(\\d{5})","$1 $2",["29"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2)(\\d{3})(\\d{3,4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["43[124-7]|70[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3",["43[124-7]|70[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["999"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["48|8[7-9]|9[08]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -704,7 +704,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"84\\d{6}","\\d{8}",,,"84123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BH",973,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"BH",973,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -719,7 +719,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BI",257,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BI",257,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -734,7 +734,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"857[58]\\d{4}","\\d{8}",,,"85751234"]
-,"BJ",229,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BJ",229,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -775,7 +775,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BN",673,"00",,,,,,,,[[,"([2-578]\\d{2})(\\d{4})","$1 $2",,"","",0]
+,"BN",673,"00",,,,,,,,[[,"([2-578]\\d{2})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -791,9 +791,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BO",591,"00(1\\d)?","0",,,"0(1\\d)?",,,,[[,"([234])(\\d{7})","$1 $2",["[234]"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"([67]\\d{7})","$1",["[67]"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -822,28 +822,28 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BR",55,"00(?:1[45]|2[135]|31|4[13])","0",,,"0(?:(1[245]|2[135]|31|4[13])(\\d{10,11}))?","$2",,,[[,"(\\d{4})(\\d{4})","$1-$2",["[2-9](?:[1-9]|0[1-9])"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1-$2",["9(?:[1-9]|0[1-9])"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{3,5})","$1",["1[125689]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["(?:[189][1-9]|2[12478]|3[1-578]|7[13-579])9"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00"]
-,"","",0]
+]
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["(?:[189][1-9]|2[12478]|3[1-578]|7[13-579])9"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00"]
-,"","",0]
+]
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"[34]00\\d{5}","\\d{8}",,,"40041234"]
@@ -872,9 +872,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BT",975,"00",,,,,,,,[[,"([17]7)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1|77"]
-,"","",0]
+]
 ,[,"([2-8])(\\d{3})(\\d{3})","$1 $2 $3",["[2-68]|7[246]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -890,11 +890,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"79[12][01]\\d{4}","\\d{8}",,,"79101234"]
 ,"BW",267,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-6]"]
-,"","",0]
+]
 ,[,"(7\\d)(\\d{3})(\\d{3})","$1 $2 $3",["7"]
-,"","",0]
+]
 ,[,"(90)(\\d{5})","$1 $2",["9"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -910,19 +910,19 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"249\\d{6}","\\d{9}",,,"249123456"]
 ,"BY",375,"810","8",,,"8?0?",,"8~10",,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["17[0-3589]|2[4-9]|[34]","17(?:[02358]|1[0-2]|9[0189])|2[4-9]|[34]"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["1(?:5[24]|6[235]|7[467])|2(?:1[246]|2[25]|3[26])","1(?:5[24]|6(?:2|3[04-9]|5[0346-9])|7(?:[46]|7[37-9]))|2(?:1[246]|2[25]|3[26])"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{3})","$1 $2-$3",["1(?:5[169]|6[3-5]|7[179])|2(?:1[35]|2[34]|3[3-5])","1(?:5[169]|6(?:3[1-3]|4|5[125])|7(?:1[3-9]|7[0-24-6]|9[2-7]))|2(?:1[35]|2[34]|3[3-5])"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8[01]|9"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(82\\d)(\\d{4})(\\d{4})","$1 $2 $3",["82"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(800)(\\d{3})","$1 $2",["800"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(800)(\\d{2})(\\d{2,4})","$1 $2 $3",["800"]
-,"8 $1","",0]
+,"8 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8(?:[013]|[12]0)\\d{8}|800\\d{3,7}|902\\d{7}","\\d{6,11}",,,"82012345678"]
@@ -938,9 +938,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BZ",501,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1-$2",["[2-8]"]
-,"","",0]
+]
 ,[,"(0)(800)(\\d{4})(\\d{3})","$1-$2-$3-$4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -982,13 +982,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CD",243,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["12"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8[0-2459]|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["88"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["[1-6]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1003,7 +1003,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CF",236,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"CF",236,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1019,9 +1019,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CG",242,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[02]"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["8"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1037,11 +1037,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"878\\d{6}","\\d{9}",,,"878123456"]
 ,[,,"NA","NA"]
 ,"CH",41,"00","0",,,"0",,,,[[,"([2-9]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-7]|[89]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8[047]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["860"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"74[0248]\\d{6}","\\d{9}",,,"740123456"]
 ,,,[,,"NA","NA"]
@@ -1056,7 +1056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CI",225,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"CI",225,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1071,7 +1071,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CK",682,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1 $2",,"","",0]
+,"CK",682,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1087,40 +1087,40 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"44\\d{7}","\\d{9}",,,"441234567"]
 ,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["2[23]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(9)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(44)(\\d{3})(\\d{4})","$1 $2 $3",["44"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([68]00)(\\d{3})(\\d{3,4})","$1 $2 $3",["60|8"]
-,"$1","",0]
+,"$1"]
 ,[,"(600)(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3 $4",["60"]
-,"$1","",0]
+,"$1"]
 ,[,"(1230)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["219"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{4,5})","$1",["[1-9]"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["2[23]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(9)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(44)(\\d{3})(\\d{4})","$1 $2 $3",["44"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([68]00)(\\d{3})(\\d{3,4})","$1 $2 $3",["60|8"]
-,"$1","",0]
+,"$1"]
 ,[,"(600)(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3 $4",["60"]
-,"$1","",0]
+,"$1"]
 ,[,"(1230)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["219"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"600\\d{7,8}","\\d{10,11}",,,"6001234567"]
@@ -1136,11 +1136,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CM",237,"00",,,,,,,,[[,"([26])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[26]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[23]|88"]
-,"","",0]
+]
 ,[,"(800)(\\d{2})(\\d{3})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1158,15 +1158,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"CN",86,"(1(?:[129]\\d{3}|79\\d{2}))?00","0",,,"(1(?:[129]\\d{3}|79\\d{2}))|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
-,"","",0]
+]
 ,[,"(\\d{5,6})","$1",["100|95"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,6})","$1 $2",["(?:10|2\\d)[19]","(?:10|2\\d)(?:10|9[56])","(?:10|2\\d)(?:100|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3,4})(\\d{4})","$1 $2",["[2-9]"]
-,"","",0]
+]
 ,[,"(21)(\\d{4})(\\d{4,6})","$1 $2 $3",["21"]
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
@@ -1176,20 +1176,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
-,"","",0]
+]
 ]
 ,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,6})","$1 $2",["(?:10|2\\d)[19]","(?:10|2\\d)(?:10|9[56])","(?:10|2\\d)(?:100|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(21)(\\d{4})(\\d{4,6})","$1 $2 $3",["21"]
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
@@ -1199,11 +1199,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
-,"","",0]
+]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"(?:4|(?:10)?8)00\\d{7}|950\\d{7,8}","\\d{10,12}",,,"4001234567"]
@@ -1219,16 +1219,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CO",57,"00(?:4(?:[14]4|56)|[579])","0",,,"0([3579]|4(?:44|56))?",,,,[[,"(\\d)(\\d{7})","$1 $2",["1(?:8[2-9]|9[0-3]|[2-7])|[24-8]","1(?:8[2-9]|9(?:09|[1-3])|[2-7])|[24-8]"]
-,"($1)","0$CC $1",0]
+,"($1)","0$CC $1"]
 ,[,"(\\d{3})(\\d{7})","$1 $2",["3"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"(1)(\\d{3})(\\d{7})","$1-$2-$3",["1(?:80|9[04])","1(?:800|9(?:0[01]|4[78]))"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d)(\\d{7})","$1 $2",["1(?:8[2-9]|9[0-3]|[2-7])|[24-8]","1(?:8[2-9]|9(?:09|[1-3])|[2-7])|[24-8]"]
-,"($1)","0$CC $1",0]
+,"($1)","0$CC $1"]
 ,[,"(\\d{3})(\\d{7})","$1 $2",["3"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"(1)(\\d{3})(\\d{7})","$1 $2 $3",["1(?:80|9[04])","1(?:800|9(?:0[01]|4[78]))"]
 ]
 ]
@@ -1246,9 +1246,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"210[0-6]\\d{4}|4\\d{7}|5100\\d{4}","\\d{8}",,,"40001234"]
 ,"CR",506,"00",,,,"(19(?:0[012468]|1[09]|20|66|77|99))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1264,11 +1264,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CU",53,"119","0",,,"0",,,,[[,"(\\d)(\\d{6,7})","$1 $2",["7"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{4,6})","$1 $2",["[2-4]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d)(\\d{7})","$1 $2",["5"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1283,7 +1283,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CV",238,"0",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"CV",238,"0",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1299,9 +1299,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CW",599,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[13-7]"]
-,"","",0]
+]
 ,[,"(9)(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"","",0]
+]
 ]
 ,,[,,"955\\d{5}","\\d{7,8}",,,"95581234"]
 ,1,,[,,"NA","NA"]
@@ -1329,7 +1329,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[1-9]\\d{5}","\\d{8}",,,"80112345"]
 ,[,,"700\\d{5}","\\d{8}",,,"70012345"]
 ,[,,"NA","NA"]
-,"CY",357,"00",,,,,,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"","",0]
+,"CY",357,"00",,,,,,,,[[,"(\\d{2})(\\d{6})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1345,11 +1345,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70[01]\\d{6}","\\d{9,12}",,,"700123456"]
 ,[,,"9[17]0\\d{6}","\\d{9,12}",,,"910123456"]
 ,"CZ",420,"00",,,,,,,,[[,"([2-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-8]|9[015-7]"]
-,"","",0]
+]
 ,[,"(96\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["96"]
-,"","",0]
+]
 ,[,"(9\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["9[36]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1365,37 +1365,37 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{8}","\\d{11}",,,"70012345678"]
 ,[,,"NA","NA"]
 ,"DE",49,"00","0",,,"0",,,,[[,"(1\\d{2})(\\d{7,8})","$1 $2",["1[67]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(15\\d{3})(\\d{6})","$1 $2",["15[0568]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{3})(\\d{7})","$1 $2",["15"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,11})","$1 $2",["3[02]|40|[68]9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,11})","$1 $2",["2(?:\\d1|0[2389]|1[24]|28|34)|3(?:[3-9][15]|40)|[4-8][1-9]1|9(?:06|[1-9]1)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{2,11})","$1 $2",["[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])","[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:3(?:0[1-467]|2[127-9]|3[124578]|[46][1246]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|3[1357]|4[13578]|6[1246]|7[1356]|9[1346])|5(?:0[14]|2[1-3589]|3[1357]|4[1246]|6[1-4]|7[1346]|8[13568]|9[1246])|6(?:0[356]|2[1-489]|3[124-6]|4[1347]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|3[1357]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|4[1347]|6[0135-9]|7[1467]|8[136])|9(?:0[12479]|2[1358]|3[1357]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(3\\d{4})(\\d{1,10})","$1 $2",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{7,12})","$1 $2",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(177)(99)(\\d{7,8})","$1 $2 $3",["177","1779","17799"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d)(\\d{4,10})","$1 $2 $3",["(?:18|90)0|137","1(?:37|80)|900[1359]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{2})(\\d{5,11})","$1 $2",["181"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d{3})(\\d{6})","$1 $2",["185","1850","18500"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d{2})(\\d{7})","$1 $2",["18[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d)(\\d{8})","$1 $2",["18[2-579]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(700)(\\d{4})(\\d{4})","$1 $2 $3",["700"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(138)(\\d{4})","$1 $2",["138"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"16(?:4\\d{1,10}|[89]\\d{1,11})","\\d{4,14}",,,"16412345"]
 ,,,[,,"NA","NA"]
@@ -1410,7 +1410,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"DJ",253,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"DJ",253,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1425,7 +1425,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"DK",45,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"DK",45,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1467,11 +1467,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"98[23]\\d{6}","\\d{9}",,,"983123456"]
 ,"DZ",213,"00","0",,,"0",,,,[[,"([1-4]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([5-8]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1487,18 +1487,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"[2-7]890\\d{4}","\\d{8}",,,"28901234"]
 ,"EC",593,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2-$3",["[247]|[356][2-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{3,4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"(\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[247]|[356][2-8]"]
 ]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{3,4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1514,13 +1514,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70[0-2]\\d{5}","\\d{8}",,,"70012345"]
 ,[,,"NA","NA"]
 ,"EE",372,"00",,,,,,,,[[,"([3-79]\\d{2})(\\d{4})","$1 $2",["[369]|4[3-8]|5(?:[0-2]|5[0-478]|6[45])|7[1-9]","[369]|4[3-8]|5(?:[02]|1(?:[0-8]|95)|5[0-478]|6(?:4[0-4]|5[1-589]))|7[1-9]"]
-,"","",0]
+]
 ,[,"(70)(\\d{2})(\\d{4})","$1 $2 $3",["70"]
-,"","",0]
+]
 ,[,"(8000)(\\d{3})(\\d{3})","$1 $2 $3",["800","8000"]
-,"","",0]
+]
 ,[,"([458]\\d{3})(\\d{3,4})","$1 $2",["40|5|8(?:00|[1-5])","40|5|8(?:00[1-9]|[1-5])"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1\\d{3,4}|800[2-9]\\d{3}","\\d{4,7}",,,"8002123"]
@@ -1536,11 +1536,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"EG",20,"00","0",,,"0",,,,[[,"(\\d)(\\d{7,8})","$1 $2",["[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1[012]|[89]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{6,7})","$1 $2",["1[35]|[4-6]|[89][2-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1568,7 +1568,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ER",291,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"0$1","",0]
+,"ER",291,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1584,9 +1584,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}",,,"701234567"]
 ,[,,"NA","NA"]
 ,"ES",34,"00",,,,,,,,[[,"([89]00)(\\d{3})(\\d{3})","$1 $2 $3",["[89]00"]
-,"","",0]
+]
 ,[,"([5-9]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[568]|[79][0-8]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1601,7 +1601,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ET",251,"00","0",,,"0",,,,[[,"([1-59]\\d)(\\d{3})(\\d{4})","$1 $2 $3",,"0$1","",0]
+,"ET",251,"00","0",,,"0",,,,[[,"([1-59]\\d)(\\d{3})(\\d{4})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1617,11 +1617,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"FI",358,"00|99[049]","0",,,"0",,,,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]00|[6-8]0)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4,10})","$1 $2",["[14]|2[09]|50|7[135]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4,11})","$1 $2",["[25689][1-8]|3"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"[13]00\\d{3,7}|2(?:0(?:0\\d{3,7}|2[023]\\d{1,6}|9[89]\\d{1,6}))|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{2,7})","\\d{5,10}",,,"100123"]
@@ -1637,9 +1637,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"FJ",679,"0(?:0|52)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1 $2",["[36-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1667,7 +1667,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"FM",691,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"FM",691,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1682,7 +1682,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"(?:6[0-36]|88)\\d{4}","\\d{6}",,,"601234"]
-,"FO",298,"00",,,,"(10(?:01|[12]0|88))",,,,[[,"(\\d{6})","$1",,"","$CC $1",0]
+,"FO",298,"00",,,,"(10(?:01|[12]0|88))",,,,[[,"(\\d{6})","$1",,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1698,16 +1698,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"9\\d{8}","\\d{9}",,,"912345678"]
 ,"FR",33,"00","0",,,"0",,,,[[,"([1-79])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[1-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{2})(\\d{3})","$1 $2",["11"]
-,"$1","",0]
+,"$1"]
 ,[,"(8\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,[[,"([1-79])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[1-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1723,9 +1723,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GA",241,"00",,,,,,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1741,25 +1741,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{8}","\\d{10}",,,"7012345678"]
 ,[,,"56\\d{8}","\\d{10}",,,"5612345678"]
 ,"GB",44,"00","0"," x",,"0",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["2|5[56]|7(?:0|6[013-9])","2|5[56]|7(?:0|6(?:[013-9]|2[0-35-9]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1(?:1|\\d1)|3|9[018]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{5})(\\d{4,5})","$1 $2",["1(?:38|5[23]|69|76|94)","1(?:387|5(?:24|39)|697|768|946)","1(?:3873|5(?:242|39[456])|697[347]|768[347]|9467)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{3})(\\d{5,6})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{3})(\\d{6})","$1 $2",["7(?:[1-5789]|62)","7(?:[1-5789]|624)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{4})","$1 $2",["800","8001","80011","800111","8001111"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(845)(46)(4\\d)","$1 $2 $3",["845","8454","84546","845464"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8(?:4[2-5]|7[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]00)(\\d{6})","$1 $2",["[58]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}","\\d{10}",,,"7640123456"]
 ,1,,[,,"NA","NA"]
@@ -1788,11 +1788,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"706\\d{6}","\\d{9}",,,"706123456"]
 ,"GE",995,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[348]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["5"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"706\\d{6}","\\d{9}",,,"706123456"]
@@ -1807,7 +1807,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GF",594,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"GF",594,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1836,9 +1836,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GH",233,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[235]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"800\\d{5}","\\d{8}",,,"80012345"]
@@ -1854,7 +1854,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GI",350,"00",,,,,,,,[[,"(\\d{3})(\\d{5})","$1 $2",["2"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1869,7 +1869,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"3[89]\\d{4}","\\d{6}",,,"381234"]
-,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1884,7 +1884,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GM",220,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"GM",220,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1900,9 +1900,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"722\\d{6}","\\d{9}",,,"722123456"]
 ,"GN",224,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["3"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[67]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1917,7 +1917,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GP",590,"00","0",,,"0",,,,[[,"([56]90)(\\d{2})(\\d{4})","$1 $2-$3",,"0$1","",0]
+,"GP",590,"00","0",,,"0",,,,[[,"([56]90)(\\d{2})(\\d{4})","$1 $2-$3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -1933,9 +1933,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GQ",240,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[235]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["[89]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1951,11 +1951,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{8}","\\d{10}",,,"7012345678"]
 ,[,,"NA","NA"]
 ,"GR",30,"00",,,,,,,,[[,"([27]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["21|7"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["2[2-9]1|[689]"]
-,"","",0]
+]
 ,[,"(2\\d{3})(\\d{6})","$1 $2",["2[2-9][02-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1971,9 +1971,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GT",502,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[2-7]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2002,9 +2002,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"40\\d{5}","\\d{7,9}",,,"4012345"]
 ,"GW",245,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["44|9[567]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["40"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2019,7 +2019,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GY",592,"001",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"GY",592,"001",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2035,13 +2035,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8[1-3]\\d{6}","\\d{8}",,,"81123456"]
 ,[,,"NA","NA"]
 ,"HK",852,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[235-7]|[89](?:0[1-9]|[1-9])"]
-,"","",0]
+]
 ,[,"(800)(\\d{3})(\\d{3})","$1 $2 $3",["800"]
-,"","",0]
+]
 ,[,"(900)(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3 $4",["900"]
-,"","",0]
+]
 ,[,"(900)(\\d{2,5})","$1 $2",["900"]
-,"","",0]
+]
 ]
 ,,[,,"7\\d{7}","\\d{8}",,,"71234567"]
 ,,,[,,"NA","NA"]
@@ -2056,7 +2056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"HN",504,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1-$2",,"","",0]
+,"HN",504,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1-$2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2072,27 +2072,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"7[45]\\d{4,7}","\\d{6,9}",,,"741234567"]
 ,[,,"NA","NA"]
 ,"HR",385,"00","0",,,"0",,,,[[,"(1)(\\d{4})(\\d{3})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6[09])(\\d{4})(\\d{3})","$1 $2 $3",["6[09]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([67]2)(\\d{3})(\\d{3,4})","$1 $2 $3",["[67]2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-5]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3,4})(\\d{3})(\\d{3})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2,3})","$1 $2 $3",["6[0145]|7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,4})(\\d{3})","$1 $2 $3",["6[0145]|7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80[01])(\\d{2})(\\d{2,3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80[01])(\\d{3,4})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2107,7 +2107,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"98[89]\\d{5}","\\d{8}",,,"98901234"]
-,"HT",509,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",,"","",0]
+,"HT",509,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2123,9 +2123,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"HU",36,"00","06",,,"06",,,,[[,"(1)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"($1)","",0]
+,"($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-9]"]
-,"($1)","",0]
+,"($1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"[48]0\\d{6}","\\d{8}",,,"80123456"]
@@ -2141,17 +2141,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ID",62,"0(?:0[1789]|10(?:00|1[67]))","0",,,"0",,,,[[,"(\\d{2})(\\d{5,8})","$1 $2",["2[124]|[36]1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5,8})","$1 $2",["[4579]|2[035-9]|[36][02-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(8\\d{2})(\\d{3,4})(\\d{3,5})","$1-$2-$3",["8[1-35-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(177)(\\d{6,8})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{5,7})","$1 $2",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d)(\\d{3})(\\d{3})","$1 $2 $3 $4",["80[79]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8071\\d{6}","\\d{10}",,,"8071123456"]
@@ -2167,23 +2167,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{6}","\\d{9}",,,"700123456"]
 ,[,,"76\\d{7}","\\d{9}",,,"761234567"]
 ,"IE",353,"00","0",,,"0",,,,[[,"(1)(\\d{3,4})(\\d{4})","$1 $2 $3",["1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["2[24-9]|47|58|6[237-9]|9[35-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["40[24]|50[45]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(48)(\\d{4})(\\d{4})","$1 $2 $3",["48"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(818)(\\d{3})(\\d{3})","$1 $2 $3",["81"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[24-69]|7[14]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([78]\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["76|8[35-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(700)(\\d{3})(\\d{3})","$1 $2 $3",["70"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:8[059]|5)","1(?:8[059]0|5)"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"18[59]0\\d{6}","\\d{10}",,,"1850123456"]
@@ -2199,21 +2199,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"7(?:18\\d|2[23]\\d|3[237]\\d|47\\d|6(?:5\\d|8[0168])|7\\d{2}|8(?:2\\d|33|55|77|81)|99\\d)\\d{5}","\\d{9}",,,"771234567"]
 ,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([57]\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[57]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1)([7-9]\\d{2})(\\d{3})(\\d{3})","$1-$2-$3-$4",["1[7-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(1255)(\\d{3})","$1-$2",["125"]
-,"$1","",0]
+,"$1"]
 ,[,"(1200)(\\d{3})(\\d{3})","$1-$2-$3",["120"]
-,"$1","",0]
+,"$1"]
 ,[,"(1212)(\\d{2})(\\d{2})","$1-$2-$3",["121"]
-,"$1","",0]
+,"$1"]
 ,[,"(1599)(\\d{6})","$1-$2",["15"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})","*$1",["[2-689]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1700\\d{6}|[2-689]\\d{3}","\\d{4,10}",,,"1700123456"]
@@ -2242,27 +2242,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[0257]|3[0157-9]|4[0-389]|6[0-35-9]|8[0-79])|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[02457-9]|7[01-69]|8[0-24-9]|9[02-9])|9","7(?:0|2(?:[0235679]|[14][017-9]|8[0-59]|9[389])|3(?:[058]|10|7[3679]|9[689])|4(?:0[1-9]|1[015-9]|[29][89]|39|8[389])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8[0-79])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1(?:2[0-249]|3[0-25]|4[145]|[569][14]|7[1257]|8[1346]|[68][1-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|[36][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)","7(?:12|2[14]|3[134]|4[47]|5(?:1|5[2-6])|[67]1|88)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:[23579]|[468][1-9])|[2-8]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1600)(\\d{2})(\\d{4})","$1 $2 $3",["160","1600"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(1800)(\\d{4,5})","$1 $2",["180","1800"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(18[06]0)(\\d{2,4})(\\d{4})","$1 $2 $3",["18[06]","18[06]0"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(140)(\\d{3})(\\d{4})","$1 $2 $3",["140"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(\\d{4})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["18[06]","18(?:0[03]|6[12])"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1(?:600\\d{6}|8(?:0(?:0\\d{4,9}|3\\d{9})|6(?:0\\d{7}|[12]\\d{9})))","\\d{8,13}",,,"1800123456"]
@@ -2277,7 +2277,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IO",246,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"IO",246,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2293,11 +2293,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"IQ",964,"00","0",,,"0",,,,[[,"(1)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-6]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2313,15 +2313,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"(?:[2-6]0\\d|993)\\d{7}","\\d{10}",,,"9932123456"]
 ,"IR",98,"00","0",,,"0",,,,[[,"(21)(\\d{3,5})","$1 $2",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})","$1 $2",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"943\\d{7}","\\d{10}",,,"9432123456"]
 ,,,[,,"NA","NA"]
@@ -2337,9 +2337,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"49\\d{5}","\\d{7}",,,"4921234"]
 ,"IS",354,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-9]"]
-,"","",0]
+]
 ,[,"(3\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2355,25 +2355,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"1(?:78\\d|99)\\d{6}","\\d{9,10}",,,"1781234567"]
 ,[,,"55\\d{8}","\\d{10}",,,"5512345678"]
 ,"IT",39,"00",,,,,,,,[[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["0[26]|55"]
-,"","",0]
+]
 ,[,"(0[26])(\\d{4})(\\d{5})","$1 $2 $3",["0[26]"]
-,"","",0]
+]
 ,[,"(0[26])(\\d{4,6})","$1 $2",["0[26]"]
-,"","",0]
+]
 ,[,"(0\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["0[13-57-9][0159]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["0[13-57-9][0159]|8(?:03|4[17]|9[245])","0[13-57-9][0159]|8(?:03|4[17]|9(?:2|[45][0-4]))"]
-,"","",0]
+]
 ,[,"(0\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["0[13-57-9][2-46-8]"]
-,"","",0]
+]
 ,[,"(0\\d{3})(\\d{2,6})","$1 $2",["0[13-57-9][2-46-8]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[13]|8(?:00|4[08]|9[59])","[13]|8(?:00|4[08]|9(?:5[5-9]|9))"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["894","894[5-9]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"848\\d{6}","\\d{9}",,,"848123456"]
@@ -2415,11 +2415,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}",,,"700123456"]
 ,[,,"NA","NA"]
 ,"JO",962,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[2356]|87"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(7)(\\d{4})(\\d{4})","$1 $2 $3",["7[457-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["70|8[0158]|9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"74(?:66|77)\\d{5}","\\d{9}",,,"746612345"]
 ,,,[,,"NA","NA"]
@@ -2435,56 +2435,56 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"60\\d{7}","\\d{9}",,,"601234567"]
 ,[,,"50[1-9]\\d{7}","\\d{10}",,,"5012345678"]
 ,"JP",81,"010","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1-$2-$3",["(?:12|57|99)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["0077"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{3,4})","$1-$2-$3",["0077"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1-$2-$3",["0088"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{3})(\\d{3,4})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{4})(\\d{4,5})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{5})(\\d{5,6})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{6})(\\d{6,7})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["[2579]0|80[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1-$2-$3",["1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|5(?:76|97)|499|746|8(?:3[89]|63|47|51)|9(?:49|80|9[16])","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:76|97)9|499[2468]|7468|8(?:3(?:8[78]|96)|636|477|51[24])|9(?:496|802|9(?:1[23]|69))","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:769|979[2-69])|499[2468]|7468|8(?:3(?:8[78]|96[2457-9])|636[2-57-9]|477|51[24])|9(?:496|802|9(?:1[23]|69))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["1(?:2[3-6]|3[3-9]|4[2-6]|5[2-8]|[68][2-7]|7[2-689]|9[1-578])|2(?:2[03-689]|3[3-58]|4[0-468]|5[04-8]|6[013-8]|7[06-9]|8[02-57-9]|9[13])|4(?:2[28]|3[689]|6[035-7]|7[05689]|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9[4-9])|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9[014-9])|8(?:2[49]|3[3-8]|4[5-8]|5[2-9]|6[35-9]|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9[3-7])","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9[2-8])|3(?:7[2-6]|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5[4-7]|6[2-9]|8[2-8]|9[236-9])|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3[34]|[4-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6[56]))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6(?:5[25]|60)))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["1|2(?:2[37]|5[5-9]|64|78|8[39]|91)|4(?:2[2689]|64|7[347])|5(?:[2-589]|39)|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93)","1|2(?:2[37]|5(?:[57]|[68]0|9[19])|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93[34])","1|2(?:2[37]|5(?:[57]|[68]0|9(?:17|99))|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93(?:31|4))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["2(?:9[14-79]|74|[34]7|[56]9)|82|993"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1-$2-$3",["3|4(?:2[09]|7[01])|6[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[2479][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d{3})(\\d{3})(\\d{3})","$1-$2-$3",["(?:12|57|99)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["[2579]0|80[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1-$2-$3",["1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|5(?:76|97)|499|746|8(?:3[89]|63|47|51)|9(?:49|80|9[16])","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:76|97)9|499[2468]|7468|8(?:3(?:8[78]|96)|636|477|51[24])|9(?:496|802|9(?:1[23]|69))","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:769|979[2-69])|499[2468]|7468|8(?:3(?:8[78]|96[2457-9])|636[2-57-9]|477|51[24])|9(?:496|802|9(?:1[23]|69))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["1(?:2[3-6]|3[3-9]|4[2-6]|5[2-8]|[68][2-7]|7[2-689]|9[1-578])|2(?:2[03-689]|3[3-58]|4[0-468]|5[04-8]|6[013-8]|7[06-9]|8[02-57-9]|9[13])|4(?:2[28]|3[689]|6[035-7]|7[05689]|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9[4-9])|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9[014-9])|8(?:2[49]|3[3-8]|4[5-8]|5[2-9]|6[35-9]|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9[3-7])","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9[2-8])|3(?:7[2-6]|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5[4-7]|6[2-9]|8[2-8]|9[236-9])|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3[34]|[4-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6[56]))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6(?:5[25]|60)))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["1|2(?:2[37]|5[5-9]|64|78|8[39]|91)|4(?:2[2689]|64|7[347])|5(?:[2-589]|39)|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93)","1|2(?:2[37]|5(?:[57]|[68]0|9[19])|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93[34])","1|2(?:2[37]|5(?:[57]|[68]0|9(?:17|99))|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93(?:31|4))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["2(?:9[14-79]|74|[34]7|[56]9)|82|993"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1-$2-$3",["3|4(?:2[09]|7[01])|6[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[2479][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[,,"20\\d{8}","\\d{10}",,,"2012345678"]
 ,,,[,,"00(?:37\\d{6,13}|66\\d{6,13}|777(?:[01]\\d{2}|5\\d{3}|8\\d{4})|882[1245]\\d{4})","\\d{8,17}",,,"00777012"]
@@ -2500,11 +2500,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KE",254,"000","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["[24-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2520,11 +2520,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-7]|31[25]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{5})","$1 $2",["3(?:1[36]|[2-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d)(\\d{3})","$1 $2 $3 $4",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2540,9 +2540,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KH",855,"00[14-9]","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["1\\d[1-9]|[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1[89]0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2570,7 +2570,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"KM",269,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"KM",269,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2599,11 +2599,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KP",850,"00|99","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"2(?:[0-24-9]\\d{2}|3(?:[0-79]\\d|8[02-9]))\\d{4}","\\d{8}",,,"23821234"]
@@ -2619,25 +2619,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"50\\d{8}","\\d{10}",,,"5012345678"]
 ,[,,"70\\d{8}","\\d{10}",,,"7012345678"]
 ,"KR",82,"00(?:[124-68]|[37]\\d{2})","0",,,"0(8[1-46-8]|85\\d{2})?",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["1(?:0|1[19]|[69]9|5[458])|[57]0","1(?:0|1[19]|[69]9|5(?:44|59|8))|[57]0"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{3,4})(\\d{4})","$1-$2-$3",["1(?:[169][2-8]|[78]|5[1-4])|[68]0|[3-6][1-9][1-9]","1(?:[169][2-8]|[78]|5(?:[1-3]|4[56]))|[68]0|[3-6][1-9][1-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d)(\\d{4})","$1-$2-$3",["131","1312"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["131","131[13-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["13[2-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3-$4",["30"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d)(\\d{3,4})(\\d{4})","$1-$2-$3",["2[1-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d)(\\d{3,4})","$1-$2",["21[0-46-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{3,4})","$1-$2",["[3-6][1-9]1","[3-6][1-9]1(?:[0-46-9])"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["1(?:5[46-9]|6[04678]|8[0579])","1(?:5(?:44|66|77|88|99)|6(?:00|44|6[16]|70|88)|8(?:00|55|77|99))"]
-,"$1","0$CC-$1",0]
+,"$1","0$CC-$1"]
 ]
 ,,[,,"15\\d{7,8}","\\d{9,10}",,,"1523456789"]
 ,,,[,,"NA","NA"]
@@ -2653,9 +2653,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KW",965,"00",,,,,,,,[[,"(\\d{4})(\\d{3,4})","$1 $2",["[126]|9[04-9]|52[25]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["5[015]|92"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2697,11 +2697,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LA",856,"00","0",,,"0",,,,[[,"(20)(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3 $4",["20"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-8]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["2[13]|3[14]|[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(30)(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["30"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2717,9 +2717,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LB",961,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[13-6]|7(?:[2-57]|62|8[0-7]|9[04-9])|8[02-9]|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([7-9]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[89][01]|7(?:[01]|6[013-9]|8[89]|9[1-3])"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2748,11 +2748,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23789]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6[56]"]
-,"","",0]
+]
 ,[,"(69)(7\\d{2})(\\d{4})","$1 $2 $3",["697"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2768,9 +2768,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LK",94,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{1})(\\d{6})","$1 $2 $3",["[1-689]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2786,13 +2786,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"332(?:0[02]|5\\d)\\d{4}","\\d{9}",,,"332001234"]
 ,"LR",231,"00","0",,,"0",,,,[[,"(2\\d)(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[2579]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([4-6])(\\d{3})(\\d{3})","$1 $2 $3",["[4-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[38]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2807,7 +2807,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LS",266,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"LS",266,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2823,13 +2823,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{8}",,,"70012345"]
 ,[,,"NA","NA"]
 ,"LT",370,"00","8",,,"[08]",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ,[,"([3-6]\\d{2})(\\d{5})","$1 $2",["3[148]|4(?:[24]|6[09])|528|6"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ,[,"([7-9]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[7-9]"]
-,"8 $1","",1]
+,"8 $1",,1]
 ,[,"(5)(2\\d{2})(\\d{4})","$1 $2 $3",["52[0-79]"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2845,23 +2845,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{6}","\\d{8}",,,"70123456"]
 ,[,,"20(?:1\\d{5}|[2-689]\\d{1,7})","\\d{4,10}",,,"20201234"]
 ,"LU",352,"00",,,,"(15(?:0[06]|1[12]|35|4[04]|55|6[26]|77|88|99)\\d)",,,,[[,"(\\d{2})(\\d{3})","$1 $2",["[2-5]|7[1-9]|[89](?:[1-9]|0[2-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["[2-5]|7[1-9]|[89](?:[1-9]|0[2-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["20"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4",["2(?:[0367]|4[3-8])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["20"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4 $5",["2(?:[0367]|4[3-8])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,4})","$1 $2 $3 $4",["2(?:[12589]|4[12])|[3-5]|7[1-9]|8(?:[1-9]|0[2-9])|9(?:[1-9]|0[2-46-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["70|80[01]|90[015]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2876,7 +2876,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"81\\d{6}","\\d{8}",,,"81123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LV",371,"00",,,,,,,,[[,"([2689]\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"LV",371,"00",,,,,,,,[[,"([2689]\\d)(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2891,7 +2891,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LY",218,"00","0",,,"0",,,,[[,"([25679]\\d)(\\d{7})","$1-$2",,"0$1","",0]
+,"LY",218,"00","0",,,"0",,,,[[,"([25679]\\d)(\\d{7})","$1-$2",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2907,13 +2907,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MA",212,"00","0",,,"0",,,,[[,"([56]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9])|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80))|892"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d{4})(\\d{4})","$1-$2",["5(?:29|38)","5(?:29|38)[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8[09])(\\d{7})","$1-$2",["8(?:0|9[013-9])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -2929,13 +2929,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MC",377,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["4"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6)(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3",["8"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8\\d{7}","\\d{8}"]
@@ -2951,11 +2951,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3[08]\\d{6}","\\d{8}",,,"30123456"]
 ,"MD",373,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["22|3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([25-7]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["2[13-79]|[5-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{5})","$1 $2",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2971,9 +2971,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"78[1-9]\\d{5}","\\d{8}",,,"78108780"]
 ,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]","[2-57-9]|6(?:[03689]|7(?:[0-8]|9[3-9]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(67)(9)(\\d{3})(\\d{3})","$1 $2 $3 $4",["679","679[0-2]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3001,7 +3001,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"22\\d{7}","\\d{9}",,,"221234567"]
-,"MG",261,"00","0",,,"0",,,,[[,"([23]\\d)(\\d{2})(\\d{3})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"MG",261,"00","0",,,"0",,,,[[,"([23]\\d)(\\d{2})(\\d{3})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3016,7 +3016,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"635\\d{4}","\\d{7}",,,"6351234"]
-,"MH",692,"011","1",,,"1",,,,[[,"(\\d{3})(\\d{4})","$1-$2",,"","",0]
+,"MH",692,"011","1",,,"1",,,,[[,"(\\d{3})(\\d{4})","$1-$2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3032,11 +3032,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MK",389,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([347]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[347]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{2})(\\d)(\\d{2})(\\d{2})","$1 $2 $3 $4",["[58]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3052,12 +3052,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ML",223,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[246-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})","$1",["67|74"]
-,"","",0]
+]
 ]
 ,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[246-9]"]
-,"","",0]
+]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3073,23 +3073,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"1333\\d{4}","\\d{8}",,,"13331234"]
 ,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["1|2[45]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2)(\\d{4})(\\d{4})","$1 $2 $3",["251"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["67|81"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3,4})","$1 $2 $3",["[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{4,6})","$1 $2 $3",["9(?:2[0-4]|[35-9]|4[137-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)([34]\\d{4})(\\d{4})","$1 $2 $3",["9(?:3[0-36]|4[0-57-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["92[56]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3 $4",["93"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3105,15 +3105,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"7[05-8]\\d{6}","\\d{8}",,,"75123456"]
 ,"MN",976,"001","0",,,"0",,,,[[,"([12]\\d)(\\d{2})(\\d{4})","$1 $2 $3",["[12]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([12]2\\d)(\\d{5,6})","$1 $2",["[12]2[1-3]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([12]\\d{3})(\\d{5})","$1 $2",["[12](?:27|[3-5])","[12](?:27|[3-5]\\d)2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["[57-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"([12]\\d{4})(\\d{4,5})","$1 $2",["[12](?:27|[3-5])","[12](?:27|[3-5]\\d)[4-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3128,7 +3128,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MO",853,"00",,,,,,,,[[,"([268]\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"MO",853,"00",,,,,,,,[[,"([268]\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3156,7 +3156,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MQ",596,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"MQ",596,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3171,7 +3171,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MR",222,"00",,,,,,,,[[,"([2-48]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"MR",222,"00",,,,,,,,[[,"([2-48]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3199,7 +3199,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"3550\\d{4}","\\d{8}",,,"35501234"]
-,"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"7117\\d{4}","\\d{8}",,,"71171234"]
 ,,,[,,"NA","NA"]
@@ -3215,9 +3215,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3(?:20|9\\d)\\d{4}","\\d{7}",,,"3201234"]
 ,"MU",230,"0(?:0|[2-7]0|33)",,,,,,"020",,[[,"([2-46-9]\\d{2})(\\d{4})","$1 $2",["[2-46-9]"]
-,"","",0]
+]
 ,[,"(5\\d{3})(\\d{4})","$1 $2",["5"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3233,9 +3233,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MV",960,"0(?:0|19)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1-$2",["[3467]|9(?:[1-9]|0[1-9])"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["900"]
-,"","",0]
+]
 ]
 ,,[,,"781\\d{4}","\\d{7}",,,"7812345"]
 ,,,[,,"NA","NA"]
@@ -3251,11 +3251,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MW",265,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[1789]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3271,18 +3271,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"500\\d{7}","\\d{10}",,,"5001234567"]
 ,[,,"NA","NA"]
 ,"MX",52,"0[09]","01",,,"0[12]|04[45](\\d{10})","1$1",,,[[,"([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)([358]\\d)(\\d{4})(\\d{4})","044 $2 $3 $4",["1(?:33|55|81)"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","044 $2 $3 $4",["1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,[[,"([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3 $4",["1(?:33|55|81)"]
 ]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3 $4",["1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])"]
@@ -3302,17 +3302,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"154\\d{7}","\\d{10}",,,"1541234567"]
 ,"MY",60,"00","0",,,"0",,,,[[,"([4-79])(\\d{3})(\\d{4})","$1-$2 $3",["[4-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(3)(\\d{4})(\\d{4})","$1-$2 $3",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([18]\\d)(\\d{3})(\\d{3,4})","$1-$2 $3",["1[02-46-9][1-9]|8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1)([36-8]00)(\\d{2})(\\d{4})","$1-$2-$3-$4",["1[36-8]0"]
-,"","",0]
+]
 ,[,"(11)(\\d{4})(\\d{4})","$1-$2 $3",["11"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(15[49])(\\d{3})(\\d{4})","$1-$2 $3",["15"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3328,9 +3328,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MZ",258,"00",,,,,,,,[[,"([28]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["2|8[2-7]"]
-,"","",0]
+]
 ,[,"(80\\d)(\\d{3})(\\d{3})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3346,13 +3346,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"8(?:3\\d{2}|86)\\d{5}","\\d{8,9}",,,"88612345"]
 ,"NA",264,"00","0",,,"0",,,,[[,"(8\\d)(\\d{3})(\\d{4})","$1 $2 $3",["8[1235]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(88)(\\d{3})(\\d{3})","$1 $2 $3",["88"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(870)(\\d{3})(\\d{3})","$1 $2 $3",["870"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3368,7 +3368,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NC",687,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[2-46-9]|5[0-4]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3384,9 +3384,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NE",227,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[289]|09"]
-,"","",0]
+]
 ,[,"(08)(\\d{3})(\\d{3})","$1 $2 $3",["08"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3402,9 +3402,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NF",672,"00",,,,,,,,[[,"(\\d{2})(\\d{4})","$1 $2",["1"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{5})","$1 $2",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3420,17 +3420,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NG",234,"009","0",,,"0",,,,[[,"([129])(\\d{3})(\\d{3,4})","$1 $2 $3",["[129]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[3-6]|7(?:[1-79]|0[1-9])|8[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2359]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([78]00)(\\d{4})(\\d{4,5})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([78]00)(\\d{5})(\\d{5,6})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(78)(\\d{2})(\\d{3})","$1 $2 $3",["78"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3445,7 +3445,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"NI",505,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"NI",505,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3461,17 +3461,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"85\\d{7}","\\d{9}",,,"851234567"]
 ,"NL",31,"00","0",,,"0",,,,[[,"([1-578]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1[035]|2[0346]|3[03568]|4[0356]|5[0358]|7|8[4578]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-5]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["1[16-8]|2[259]|3[124]|4[17-9]|5[124679]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6)(\\d{8})","$1 $2",["6[0-57-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(66)(\\d{7})","$1 $2",["66"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(14)(\\d{3,4})","$1 $2",["14"]
-,"$1","",0]
+,"$1"]
 ,[,"([89]0\\d)(\\d{4,7})","$1 $2",["80|9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"66\\d{7}","\\d{9}",,,"662345678"]
 ,,,[,,"14\\d{3,4}","\\d{5,6}"]
@@ -3487,9 +3487,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"880\\d{5}","\\d{8}",,,"88012345"]
 ,[,,"85[0-5]\\d{5}","\\d{8}",,,"85012345"]
 ,"NO",47,"00",,,,,,,,[[,"([489]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[489]"]
-,"","",0]
+]
 ,[,"([235-7]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[235-7]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -3505,11 +3505,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NP",977,"00","0",,,"0",,,,[[,"(1)(\\d{7})","$1-$2",["1[2-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{6})","$1-$2",["1[01]|[2-8]|9(?:[1-69]|7[15-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d{2})(\\d{7})","$1-$2",["9(?:6[013]|7[245]|8)"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3524,7 +3524,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3553,17 +3553,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}",,,"701234567"]
 ,[,,"NA","NA"]
 ,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[346]|7[2-57-9]|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(24099)(\\d{3})","$1 $2",["240","2409","24099"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|70|86"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["2[028]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:10|74)|5|[89]0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"[28]6\\d{6,7}","\\d{8,9}",,,"26123456"]
 ,,,[,,"NA","NA"]
@@ -3579,11 +3579,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"OM",968,"00",,,,,,,,[[,"(2\\d)(\\d{6})","$1 $2",["2"]
-,"","",0]
+]
 ,[,"(9\\d{3})(\\d{4})","$1 $2",["9"]
-,"","",0]
+]
 ,[,"([58]00)(\\d{4,6})","$1 $2",["[58]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3599,9 +3599,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PA",507,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1-$2",["[1-57-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["6"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3617,13 +3617,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[24]\\d{5}","\\d{8}",,,"80212345"]
 ,[,,"NA","NA"]
 ,"PE",51,"19(?:1[124]|77|90)00","0"," Anexo ",,"0",,,,[[,"(1)(\\d{7})","$1 $2",["1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([4-8]\\d)(\\d{6})","$1 $2",["[4-7]|8[2-4]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["80"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(9\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3639,9 +3639,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["4[09]|8[79]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["44"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"44\\d{4}","\\d{6}",,,"441234"]
@@ -3657,9 +3657,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"275\\d{4}","\\d{7}",,,"2751234"]
 ,"PG",675,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[13-689]|27"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["20|7"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3675,21 +3675,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PH",63,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(2)(\\d{5})","$1 $2",["2"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{4})(\\d{4,6})","$1 $2",["3(?:23|39|46)|4(?:2[3-6]|[35]9|4[26]|76)|5(?:22|44)|642|8(?:62|8[245])","3(?:230|397|461)|4(?:2(?:35|[46]4|51)|396|4(?:22|63)|59[347]|76[15])|5(?:221|446)|642[23]|8(?:622|8(?:[24]2|5[13]))"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["346|4(?:27|9[35])|883","3469|4(?:279|9(?:30|56))|8834"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([3-8]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[3-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["81|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ,[,"(1800)(\\d{1,2})(\\d{3})(\\d{4})","$1 $2 $3 $4",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3705,21 +3705,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"122\\d{6}","\\d{9}",,,"122044444"]
 ,[,,"NA","NA"]
 ,"PK",92,"00","0",,,"0",,,,[[,"(\\d{2})(111)(\\d{3})(\\d{3})","$1 $2 $3 $4",["(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)1","(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)11","(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)111"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(111)(\\d{3})(\\d{3})","$1 $2 $3 $4",["2[349]|45|54|60|72|8[2-5]|9[2-9]","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d1","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d11","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d111"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{7,8})","$1 $2",["(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{6,7})","$1 $2",["2[349]|45|54|60|72|8[2-5]|9[2-9]","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d[2-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(3\\d{2})(\\d{7})","$1 $2",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([15]\\d{3})(\\d{5,6})","$1 $2",["58[12]|1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(586\\d{2})(\\d{5})","$1 $2",["586"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([89]00)(\\d{3})(\\d{2})","$1 $2 $3",["[89]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3735,15 +3735,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"39\\d{7}","\\d{9}",,,"391234567"]
 ,"PL",48,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[14]|2[0-57-9]|3[2-4]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{1})(\\d{4})","$1 $2 $3",["[12]2"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["26|39|5[0137]|6[0469]|7[02389]|8[08]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["64"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})","$1 $2",["64"]
-,"","",0]
+]
 ]
 ,,[,,"64\\d{4,7}","\\d{6,9}",,,"641234567"]
 ,,,[,,"NA","NA"]
@@ -3758,7 +3758,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"PM",508,"00","0",,,"0",,,,[[,"([45]\\d)(\\d{2})(\\d{2})","$1 $2 $3",,"0$1","",0]
+,"PM",508,"00","0",,,"0",,,,[[,"([45]\\d)(\\d{2})(\\d{2})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3787,11 +3787,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PS",970,"00","0",,,"0",,,,[[,"([2489])(2\\d{2})(\\d{4})","$1 $2 $3",["[2489]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5[69]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[78]00)(\\d{3})(\\d{3})","$1 $2 $3",["1[78]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3807,9 +3807,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"884[0-4689]\\d{5}","\\d{9}",,,"884123456"]
 ,[,,"30\\d{7}","\\d{9}",,,"301234567"]
 ,"PT",351,"00",,,,,,,,[[,"(2\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2[12]"]
-,"","",0]
+]
 ,[,"([2-46-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2[3-9]|[346-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3824,7 +3824,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"PW",680,"01[12]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"PW",680,"01[12]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3840,15 +3840,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"8700[0-4]\\d{4}","\\d{9}",,,"870012345"]
 ,"PY",595,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["(?:[26]1|3[289]|4[124678]|7[123]|8[1236])"]
-,"($1)","",0]
+,"($1)"]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["[2-9]0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8700"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4,6})","$1 $2",["[2-8][1-9]"]
-,"($1)","",0]
+,"($1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3864,9 +3864,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"QA",974,"00",,,,,,,,[[,"([28]\\d{2})(\\d{4})","$1 $2",["[28]"]
-,"","",0]
+]
 ,[,"([3-7]\\d{3})(\\d{4})","$1 $2",["[3-7]"]
-,"","",0]
+]
 ]
 ,,[,,"2(?:[12]\\d|61)\\d{4}","\\d{7}",,,"2123456"]
 ,,,[,,"NA","NA"]
@@ -3881,7 +3881,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}","\\d{9}",,,"810123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,"262|6[49]|8",[,,"NA","NA"]
@@ -3897,13 +3897,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"802\\d{6}","\\d{9}",,,"802123456"]
 ,[,,"NA","NA"]
 ,"RO",40,"00","0"," int ",,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[23]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(21)(\\d{4})","$1 $2",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3919,17 +3919,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RS",381,"00","0",,,"0",,,,[[,"([23]\\d{2})(\\d{4,9})","$1 $2",["(?:2[389]|39)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-3]\\d)(\\d{5,10})","$1 $2",["1|2(?:[0-24-7]|[389][1-9])|3(?:[0-8]|9[1-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6\\d)(\\d{6,8})","$1 $2",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3,9})","$1 $2",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7[26])(\\d{4,9})","$1 $2",["7[26]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7[08]\\d)(\\d{4,9})","$1 $2",["7[08]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3945,16 +3945,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RU",7,"810","8",,,"8",,"8~10",,[[,"(\\d{3})(\\d{2})(\\d{2})","$1-$2-$3",["[1-79]"]
-,"$1","",1]
+,"$1",,1]
 ,[,"([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["[34689]"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ]
 ,[[,"([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["[34689]"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ]
 ,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -3970,11 +3970,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RW",250,"00","0",,,"0",,,,[[,"(2\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"$1","",0]
+,"$1"]
 ,[,"([7-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3990,17 +3990,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SA",966,"00","0",,,"0",,,,[[,"([1-467])(\\d{3})(\\d{4})","$1 $2 $3",["[1-467]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1[1-467]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3})(\\d{4})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(92\\d{2})(\\d{5})","$1 $2",["92"]
-,"$1","",0]
+,"$1"]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"$1","",0]
+,"$1"]
 ,[,"(811)(\\d{3})(\\d{3,4})","$1 $2 $3",["81"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4016,7 +4016,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5[12]\\d{3}","\\d{5}",,,"51123"]
 ,"SB",677,"0[01]",,,,,,,,[[,"(\\d{2})(\\d{5})","$1 $2",["[7-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4032,9 +4032,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"64\\d{5}","\\d{7}",,,"6412345"]
 ,"SC",248,"0[0-2]",,,,,,"00",,[[,"(\\d{3})(\\d{3})","$1 $2",["8"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[246]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4049,7 +4049,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SD",249,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",,"0$1","",0]
+,"SD",249,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4065,25 +4065,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"75[1-8]\\d{6}","\\d{9}",,,"751234567"]
 ,[,,"NA","NA"]
 ,"SE",46,"00","0",,,"0",,,,[[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-69]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["1[13689]|2[136]|3[1356]|4[0246]|54|6[03]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[2457]|2[2457-9]|3[0247-9]|4[1357-9]|5[0-35-9]|6[124-9]|9(?:[125-8]|3[0-5]|4[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2,3})(\\d{2})","$1-$2 $3",["1[2457]|2[2457-9]|3[0247-9]|4[1357-9]|5[0-35-9]|6[124-9]|9(?:[125-8]|3[0-5]|4[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d)(\\d{3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(77)(\\d{2})(\\d{2})","$1-$2$3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(20)(\\d{2,3})(\\d{2})","$1-$2 $3",["20"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9[034]\\d)(\\d{2})(\\d{2})(\\d{3})","$1-$2 $3 $4",["9[034]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9[034]\\d)(\\d{4})","$1-$2",["9[034]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
 ]
@@ -4120,13 +4120,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3[12]\\d{6}","\\d{8}",,,"31234567"]
 ,"SG",65,"0[0-3]\\d",,,,,,,,[[,"([3689]\\d{3})(\\d{4})","$1 $2",["[369]|8[1-9]"]
-,"","",0]
+]
 ,[,"(1[89]00)(\\d{3})(\\d{4})","$1 $2 $3",["1[89]"]
-,"","",0]
+]
 ,[,"(7000)(\\d{4})(\\d{3})","$1 $2 $3",["70"]
-,"","",0]
+]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4155,13 +4155,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"(?:59|8[1-3])\\d{6}","\\d{8}",,,"59012345"]
 ,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[2-8]|7[3-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([3-7]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[37][01]|4[0139]|51|6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89][09])(\\d{3,6})","$1 $2",["[89][09]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{2})(\\d{5})","$1 $2",["59|8[1-3]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4190,11 +4190,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"6(?:5[0-4]|9[0-6])\\d{6}","\\d{9}",,,"690123456"]
 ,"SK",421,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{3})(\\d{2})","$1/$2 $3 $4",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-5]\\d)(\\d{3})(\\d{2})(\\d{2})","$1/$2 $3 $4",["[3-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([689]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[689]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"(?:8(?:00|[5-9]\\d)|9(?:00|[78]\\d))\\d{6}","\\d{9}",,,"800123456"]
@@ -4209,7 +4209,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SL",232,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"(0$1)","",0]
+,"SL",232,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"(0$1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4225,14 +4225,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5[158]\\d{6}","\\d{8}",,,"58001110"]
 ,"SM",378,"00",,,,"(?:0549)?([89]\\d{5})","0549$1",,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]
-,"","",0]
+]
 ,[,"(0549)(\\d{6})","$1 $2",["0"]
-,"","",0]
+]
 ,[,"(\\d{6})","0549 $1",["[89]"]
-,"","",0]
+]
 ]
 ,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]
-,"","",0]
+]
 ,[,"(0549)(\\d{6})","($1) $2",["0"]
 ]
 ,[,"(\\d{6})","(0549) $1",["[89]"]
@@ -4252,9 +4252,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3392\\d{5}|93330\\d{4}","\\d{9}",,,"933301234"]
 ,"SN",221,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[379]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4270,13 +4270,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SO",252,"00","0",,,"0",,,,[[,"(\\d)(\\d{6})","$1 $2",["2[0-79]|[13-5]"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{7})","$1 $2",["24|[67]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,7})","$1 $2",["15|28|6[1-35-9]|799|9[2-9]"]
-,"","",0]
+]
 ,[,"(90\\d)(\\d{3})(\\d{3})","$1 $2 $3",["90"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4292,11 +4292,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5(?:6\\d{4}|90[0-4]\\d{3})","\\d{6,7}",,,"561234"]
 ,"SR",597,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1-$2",["[2-4]|5[2-58]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1-$2-$3",["56"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1-$2",["59|[6-8]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4311,7 +4311,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"0$1","",0]
+,"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4326,7 +4326,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4342,11 +4342,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SV",503,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[267]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["[89]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["[89]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4375,9 +4375,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SY",963,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-5]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(9\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"]
-,"0$1","",1]
+,"0$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4393,7 +4393,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SZ",268,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[027]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"0800\\d{4}","\\d{8}",,,"08001234"]
@@ -4434,7 +4434,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TD",235,"00|16",,,,,,"00",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"TD",235,"00|16",,,,,,"00",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4449,7 +4449,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TG",228,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"TG",228,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4465,11 +4465,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"6[08]\\d{7}","\\d{9}",,,"601234567"]
 ,"TH",66,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([13-9]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["14|[3-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1\\d{3}","\\d{4}",,,"1100"]
@@ -4485,13 +4485,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TJ",992,"810","8",,,"8",,"8~10",,[[,"([349]\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["[34]7|91[78]"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"([459]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["4[48]|5|9(?:1[59]|[0235-9])"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"(331700)(\\d)(\\d{2})","$1 $2 $3",["331","3317","33170","331700"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1 $2 $3",["3[1-5]","3(?:[1245]|3(?:[02-9]|1[0-589]))"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4520,9 +4520,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{5}","\\d{7}",,,"7012345"]
 ,[,,"NA","NA"]
 ,"TL",670,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-489]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["7"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4538,11 +4538,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TM",993,"810","8",,,"8",,"8~10",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["12"]
-,"(8 $1)","",0]
+,"(8 $1)"]
 ,[,"(\\d{2})(\\d{6})","$1 $2",["6"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(\\d{3})(\\d)(\\d{2})(\\d{2})","$1 $2-$3-$4",["13|[2-5]"]
-,"(8 $1)","",0]
+,"(8 $1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4557,7 +4557,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8[12]10\\d{4}","\\d{8}",,,"81101234"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TN",216,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"TN",216,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4573,11 +4573,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TO",676,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1-$2",["[1-6]|7[0-4]|8[05]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["7[5-9]|8[47-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})","$1 $2",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4593,11 +4593,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TR",90,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[23]|4(?:[0-35-9]|4[0-35-9])"]
-,"(0$1)","",1]
+,"(0$1)",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[589]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(444)(\\d{1})(\\d{3})","$1 $2 $3",["444"]
-,"","",0]
+]
 ]
 ,,[,,"512\\d{7}","\\d{10}",,,"5123456789"]
 ,,,[,,"444\\d{4}","\\d{7}",,,"4441444"]
@@ -4639,11 +4639,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"70\\d{8}","\\d{10}",,,"7012345678"]
 ,"TW",886,"0(?:0[25679]|19)","0","#",,"0",,,,[[,"([2-8])(\\d{3,4})(\\d{4})","$1 $2 $3",["[2-6]|[78][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["80|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(70)(\\d{4})(\\d{4})","$1 $2 $3",["70"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4659,11 +4659,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"41\\d{7}","\\d{9}",,,"412345678"]
 ,"TZ",255,"00[056]","0",,,"0",,,,[[,"([24]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[24]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([67]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[67]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4679,11 +4679,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"89\\d{7}","\\d{9}",,,"891234567"]
 ,"UA",380,"00","0",,,"0",,"0~0",,[[,"([3-9]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[38]9|4(?:[45][0-5]|87)|5(?:0|6[37]|7[37])|6[36-8]|73|9[1-9]","[38]9|4(?:[45][0-5]|87)|5(?:0|6(?:3[14-7]|7)|7[37])|6[36-8]|73|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-689]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3[1-8]2|4[13678]2|5(?:[12457]2|6[24])|6(?:[49]2|[12][29]|5[24])|8[0-8]|90","3(?:[1-46-8]2[013-9]|52)|4(?:[1378]2|62[013-9])|5(?:[12457]2|6[24])|6(?:[49]2|[12][29]|5[24])|8[0-8]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-6]\\d{3})(\\d{5})","$1 $2",["3(?:5[013-9]|[1-46-8])|4(?:[137][013-9]|6|[45][6-9]|8[4-6])|5(?:[1245][013-9]|6[0135-9]|3|7[4-6])|6(?:[49][013-9]|5[0135-9]|[12][13-8])","3(?:5[013-9]|[1-46-8](?:22|[013-9]))|4(?:[137][013-9]|6(?:[013-9]|22)|[45][6-9]|8[4-6])|5(?:[1245][013-9]|6(?:3[02389]|[015689])|3|7[4-6])|6(?:[49][013-9]|5[0135-9]|[12][13-8])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4699,11 +4699,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"UG",256,"00[057]","0",,,"0",,,,[[,"(\\d{3})(\\d{6})","$1 $2",["[7-9]|20(?:[013-8]|2[5-9])|4(?:6[45]|[7-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{7})","$1 $2",["3|4(?:[1-5]|6[0-36-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2024)(\\d{5})","$1 $2",["2024"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4718,8 +4718,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5(?:00|33|44|66|77)[2-9]\\d{6}","\\d{10}",,,"5002345678"]
 ,[,,"NA","NA"]
-,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",,"","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3",,"","",1]
+,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3"]
 ]
 ,[[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3"]
 ]
@@ -4737,11 +4737,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"UY",598,"0(?:1[3-9]\\d|0)","0"," int. ",,"0",,"00",,[[,"(\\d{4})(\\d{4})","$1 $2",["[24]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["[89]0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4756,7 +4756,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"UZ",998,"810","8",,,"8",,"8~10",,[[,"([679]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"8 $1","",0]
+,"UZ",998,"810","8",,,"8",,"8~10",,[[,"([679]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"8 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4797,7 +4797,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"VE",58,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{7})","$1-$2",,"0$1","$CC $1",0]
+,"VE",58,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{7})","$1-$2",,"0$1","$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4839,23 +4839,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"VN",84,"00","0",,,"0",,,,[[,"([17]99)(\\d{4})","$1 $2",["[17]99"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([48])(\\d{4})(\\d{4})","$1 $2 $3",["[48]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([235-7]\\d)(\\d{4})(\\d{3})","$1 $2 $3",["2[025-79]|3[0136-9]|5[2-9]|6[0-46-8]|7[02-79]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(80)(\\d{5})","$1 $2",["80"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(69\\d)(\\d{4,5})","$1 $2",["69"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([235-7]\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["2[1348]|3[25]|5[01]|65|7[18]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(9\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1[2689]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1(?:[26]|8[68]|99)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1[89]00)(\\d{4,6})","$1 $2",["1[89]0"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"[17]99\\d{4}|69\\d{5,6}","\\d{7,8}",,,"1992000"]
@@ -4871,7 +4871,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"VU",678,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[579]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4886,7 +4886,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"WF",681,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"WF",681,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4902,11 +4902,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"WS",685,"0",,,,,,,,[[,"(8\\d{2})(\\d{3,4})","$1 $2",["8"]
-,"","",0]
+]
 ,[,"(7\\d)(\\d{5})","$1 $2",["7"]
-,"","",0]
+]
 ,[,"(\\d{5})","$1",["[2-6]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4922,9 +4922,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"YE",967,"00","0",,,"0",,,,[[,"([1-7])(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-6]|7[24-68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["7[0137]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4953,13 +4953,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"87\\d{7}","\\d{9}",,,"871234567"]
 ,"ZA",27,"00","0",,,"0",,,,[[,"(860)(\\d{3})(\\d{3})","$1 $2 $3",["860"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[1-79]|8(?:[0-47]|6[1-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,4})","$1 $2",["8[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["8[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4975,9 +4975,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ZM",260,"00","0",,,"0",,,,[[,"([29]\\d)(\\d{7})","$1 $2",["[29]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{3})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4993,25 +4993,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"86(?:1[12]|30|44|55|77|8[367]|99)\\d{6}","\\d{10}",,,"8686123456"]
 ,"ZW",263,"00","0",,,"0",,,,[[,"([49])(\\d{3})(\\d{2,4})","$1 $2 $3",["4|9[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(86\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["86[24]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2356]\\d{2})(\\d{3,5})","$1 $2",["2(?:0[45]|2[278]|[49]8|[78])|3(?:08|17|3[78]|7[1569]|8[37]|98)|5[15][78]|6(?:[29]8|[38]7|6[78]|75|[89]8)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:1[39]|2[0157]|6[14]|7[35]|84)|329"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-356]\\d)(\\d{3,5})","$1 $2",["1[3-9]|2[0569]|3[0-69]|5[05689]|6[0-46-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([235]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[23]9|54"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([25]\\d{3})(\\d{3,5})","$1 $2",["(?:25|54)8","258[23]|5483"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{3})(\\d{6})","$1 $2",["86"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5026,7 +5026,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",800,"",,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5041,7 +5041,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"\\d{8}","\\d{8}",,,"12345678"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",808,"",,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"001",808,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5056,7 +5056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",870,"",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"001",870,,,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5071,7 +5071,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"10\\d{10}","\\d{12}",,,"101234567890"]
-,"001",878,"",,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3",,"","",0]
+,"001",878,,,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5086,8 +5086,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",881,"",,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
-,"","",0]
+,"001",881,,,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5102,20 +5102,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15678]|9[0689])\\d{4}|6\\d{5,10})|345\\d{7}","\\d{7,12}",,,"3451234567"]
-,"001",882,"",,,,,,,,[[,"(\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["3[23]"]
-,"","",0]
+,"001",882,,,,,,,,,[[,"(\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["3[23]"]
+]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["16|342"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["34[57]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["348"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["16"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{4,5})(\\d{5})","$1 $2 $3",["16"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5130,12 +5130,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"51(?:00\\d{5}(?:\\d{3})?|[13]0\\d{8})","\\d{9}(?:\\d{3})?",,,"510012345"]
-,"001",883,"",,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["510"]
-,"","",0]
+,"001",883,,,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["510"]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["510"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})(\\d{4})","$1 $2 $3",["51[13]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5150,7 +5150,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",888,"",,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{5})","$1 $2 $3",,"","",0]
+,"001",888,,,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{5})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5165,7 +5165,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",979,"",,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",,"","",0]
+,"001",979,,,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
diff --git a/javascript/i18n/phonenumbers/metadatafortesting.js b/javascript/i18n/phonenumbers/metadatafortesting.js
index 53f8897f1..fb2611811 100644
--- a/javascript/i18n/phonenumbers/metadatafortesting.js
+++ b/javascript/i18n/phonenumbers/metadatafortesting.js
@@ -96,7 +96,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"AO",244,"00","0~0",,,"0~0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"AO",244,"00","0~0",,,"0~0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -112,26 +112,26 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AR",54,"00","0",,,"0(?:(11|343|3715)15)?","9$1",,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["11"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["1[02-9]|[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$2 15 $3-$4",["911"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$2 $3-$4",["9(?:1[02-9]|[23])"]
-,"0$1","0$1 $CC",0]
+,"0$1","0$1 $CC"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["11"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["1[02-9]|[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$1 $2 $3 $4",["911"]
 ]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3 $4",["9(?:1[02-9]|[23])"]
 ]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -147,9 +147,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AU",61,"001[12]","0",,,"0",,"0011",,[[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{1})(\\d{4})(\\d{4})","$1 $2 $3",["[2-478]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -177,7 +177,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BR",55,"",,,,,,,1,,,[,,"NA","NA"]
+,"BR",55,,,,,,,,1,,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -204,11 +204,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BY",375,"810","8",,,"80?|99999",,,1,[[,"(\\d{4})","$1",["[1-8]"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(\\d{2})(\\d{3})","$1 $2",["[1-8]"]
-,"8$1","",0]
+,"8$1"]
 ,[,"(\\d{3})(\\d{3})","$1 $2",["[1-8]"]
-,"8 $1","",0]
+,"8 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -236,7 +236,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CC",61,"",,,,,,,1,,,[,,"NA","NA"]
+,"CC",61,,,,,,,,1,,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -249,8 +249,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CN",86,"",,,,,,,1,[[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|95)"]
-,"$1","$CC $1",0]
+,"CN",86,,,,,,,,1,[[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|95)"]
+,"$1","$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -279,17 +279,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"DE",49,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3,8})","$1 $2",["2|3[3-9]|906|[4-9][1-9]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4,11})","$1/$2",["[34]0|[68]9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([4-9]\\d)(\\d{2})","$1 $2",["[4-9]","[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([4-9]\\d{3})(\\d{2,7})","$1 $2",["[4-9]","[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{1})(\\d{6})","$1 $2 $3",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,4})(\\d{4})","$1 $2 $3",["900"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -305,7 +305,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"FR",33,"00","0",,,"0",,,1,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["3"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -321,13 +321,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{8}","\\d{10}"]
 ,[,,"56\\d{8}","\\d{10}"]
 ,"GB",44,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-59]|[78]0"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["6"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["7[1-57-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8[47]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ]
 ,,[,,"76\\d{8}","\\d{10}"]
 ,,,[,,"NA","NA"]
@@ -342,7 +342,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GG",44,"",,,,,,,1,,,[,,"NA","NA"]
+,"GG",44,,,,,,,,1,,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -355,7 +355,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"HU",36,"","06",,,"06",,,1,,,[,,"NA","NA"]
+,"HU",36,,"06",,,"06",,,1,,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -369,13 +369,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"IT",39,"00",,,,,,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["0[26]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{3,4})","$1 $2 $3",["0[13-57-9]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["3"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["8"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -391,19 +391,19 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"JP",81,"010","0",,,"0",,,1,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[57-9]0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3 $4",["[57-9]0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["111|222|333","(?:111|222|333)1","(?:111|222|333)11"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1 $2 $3",["222|333","2221|3332","22212|3332","222120|3332"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1 $2 $3",["[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{4})","$1-$2",["077"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})","*$1",["[23]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"[23]\\d{3}","\\d{4}"]
@@ -419,29 +419,29 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"50\\d{8}","\\d{10}",,,"5012345678"]
 ,[,,"70\\d{8}","\\d{10}",,,"7012345678"]
 ,"KR",82,"00(?:[124-68]|[37]\\d{2})","0",,,"0(8[1-46-8]|85\\d{2})?",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["1(?:0|1[19]|[69]9|5[458])|[57]0","1(?:0|1[19]|[69]9|5(?:44|59|8))|[57]0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["1(?:[169][2-8]|[78]|5[1-4])|[68]0|[3-6][1-9][2-9]","1(?:[169][2-8]|[78]|5(?:[1-3]|4[56]))|[68]0|[3-6][1-9][2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d)(\\d{4})","$1-$2-$3",["131","1312"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["131","131[13-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["13[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3-$4",["30"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1-$2-$3",["2(?:[26]|3[0-467])","2(?:[26]|3(?:01|1[45]|2[17-9]|39|4|6[67]|7[078]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{4})","$1-$2-$3",["2(?:3[0-35-9]|[457-9])","2(?:3(?:0[02-9]|1[0-36-9]|2[02-6]|3[0-8]|6[0-589]|7[1-69]|[589])|[457-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})","$1-$2",["21[0-46-9]","21(?:[0-247-9]|3[124]|6[1269])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})","$1-$2",["21[36]","21(?:3[035-9]|6[03-578])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})","$1-$2",["[3-6][1-9]1","[3-6][1-9]1(?:[0-46-9])","[3-6][1-9]1(?:[0-247-9]|3[124]|6[1269])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})","$1-$2",["[3-6][1-9]1","[3-6][1-9]1[36]","[3-6][1-9]1(?:3[035-9]|6[03-578])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -457,22 +457,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MX",52,"00","01",,,"01|04[45](\\d{10})","1$1",,,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]00"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)(\\d{2})(\\d{4})(\\d{4})","045 $2 $3 $4",["1(?:33|55|81)"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","045 $2 $3 $4",["1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]00"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3 $4",["1(?:33|55|81)"]
 ]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3 $4",["1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])"]
@@ -492,11 +492,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NZ",64,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1-$2 $3",["24|[34679]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{3,5})","$1-$2 $3",["2[179]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -511,7 +511,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"PL",48,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"PL",48,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -526,7 +526,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,"262|6(?:9[23]|47)|8",[,,"NA","NA"]
@@ -555,11 +555,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SG",65,"0[0-3][0-9]",,,,"777777",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[369]|8[1-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["1[89]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["800"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -574,10 +574,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"US",1,"011","1"," extn. ",,"1",,,1,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",,"","",1]
+,"US",1,"011","1"," extn. ",,"1",,,1,[[,"(\\d{3})(\\d{4})","$1 $2"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3"]
 ]
-,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",,"","",1]
+,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3"]
 ]
 ,[,,"NA","NA"]
 ,1,,[,,"800\\d{7}","\\d{10}",,,"1234567890"]
@@ -605,7 +605,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",800,"",,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -620,7 +620,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",979,"",,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",,"","",0]
+,"001",979,,,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
index 08c228e00..818f5d9f7 100644
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@@ -274,9 +274,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AD",376,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1 $2",["[346-9]"]
-,"","",0]
+]
 ,[,"(180[02])(\\d{4})","$1 $2",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -292,13 +292,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AE",971,"00","0",,,"0",,,,[[,"([2-4679])(\\d{3})(\\d{4})","$1 $2 $3",["[2-4679][2-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([479]00)(\\d)(\\d{5})","$1 $2 $3",["[479]0"]
-,"$1","",0]
+,"$1"]
 ,[,"([68]00)(\\d{2,9})","$1 $2",["60|8"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -314,7 +314,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AF",93,"00","0",,,"0",,,,[[,"([2-7]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[2-7]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -356,13 +356,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,"AL",355,"00","0",,,"0",,,,[[,"(4)(\\d{3})(\\d{4})","$1 $2 $3",["4[0-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6[6-9])(\\d{3})(\\d{4})","$1 $2 $3",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2358][2-5]|4[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,5})","$1 $2",["[235][16-9]|8[016-9]|[79]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -378,13 +378,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"60[2-6]\\d{5}","\\d{8}"]
 ,"AM",374,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",["1|47"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{6})","$1 $2",["4[139]|[5-7]|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["[23]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["8|90"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -399,7 +399,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"AO",244,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"AO",244,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -415,30 +415,30 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{3})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["[2-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$2 15-$3-$4",["911"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$2 15-$3-$4",["9[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})","$1",["1[012]|911"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$1 $2 $3-$4",["911"]
 ]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
@@ -446,11 +446,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3-$4",["9[23]"]
 ]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[456]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1239])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
-,"0$1","",1]
+,"0$1",,1]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"810\\d{7}","\\d{10}"]
@@ -479,17 +479,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"780\\d{6,10}","\\d{9,13}"]
 ,"AT",43,"00","0",,,"0",,,,[[,"(1)(\\d{3,12})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3,5})","$1 $2",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{4})(\\d{4,7})","$1 $2 $3",["5[079]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,10})","$1 $2",["316|46|51|732|6(?:44|5[0-3579]|[6-9])|7(?:1|[28]0)|[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3,9})","$1 $2",["2|3(?:1[1-578]|[3-8])|4[2378]|5[2-6]|6(?:[12]|4[1-35-9]|5[468])|7(?:2[1-8]|35|4[1-8]|[5-79])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -505,21 +505,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"500\\d{6}","\\d{9}"]
 ,[,,"550\\d{6}","\\d{9}"]
 ,"AU",61,"(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88))?001[14-689]","0",,,"0",,"0011",,[[,"([2378])(\\d{4})(\\d{4})","$1 $2 $3",["[2378]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[45]|14"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(16)(\\d{3})(\\d{2,4})","$1 $2 $3",["16"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[389]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:[38]0|90)","1(?:[38]00|90)"]
-,"$1","",0]
+,"$1"]
 ,[,"(180)(2\\d{3})","$1 $2",["180","1802"]
-,"$1","",0]
+,"$1"]
 ,[,"(19\\d)(\\d{3})","$1 $2",["19[13]"]
-,"$1","",0]
+,"$1"]
 ,[,"(19\\d{2})(\\d{4})","$1 $2",["19[67]"]
-,"$1","",0]
+,"$1"]
 ,[,"(13)(\\d{2})(\\d{2})","$1 $2 $3",["13[1-9]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"16\\d{3,7}","\\d{5,9}"]
 ,1,,[,,"1(?:3(?:\\d{4}|00\\d{6})|80(?:0\\d{6}|2\\d{3}))","\\d{6,10}"]
@@ -534,7 +534,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"28\\d{5}|501\\d{4}","\\d{7}"]
-,"AW",297,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"AW",297,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -563,11 +563,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"AZ",994,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["(?:1[28]|2(?:[45]2|[0-36])|365)"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -583,11 +583,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BA",387,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2-$3",["[3-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["6[1-356]|[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["6[047]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -616,13 +616,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"96(?:0[49]|1[0-4]|6[69])\\d{6}","\\d{10}"]
 ,"BD",880,"00[12]?","0",,,"0",,"00",,[[,"(2)(\\d{7})","$1-$2",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4,6})","$1-$2",["[3-79]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3,6})","$1-$2",["1|3(?:0|[2-58]2)|4(?:0|[25]2|3[23]|[4689][25])|5(?:[02-578]2|6[25])|6(?:[0347-9]2|[26][25])|7[02-9]2|8(?:[023][23]|[4-7]2)|9(?:[02][23]|[458]2|6[016])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,7})","$1-$2",["[3-79][2-9]|8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -638,13 +638,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BE",32,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["4[6-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[23]|4[23]|9[2-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[156]|7[018]|8(?:0[1-9]|[1-79])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["(?:80|9)0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -659,7 +659,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BF",226,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BF",226,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -675,21 +675,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{5,9}"]
 ,[,,"NA","NA"]
 ,"BG",359,"00","0",,,"0",,,,[[,"(2)(\\d{5})","$1 $2",["29"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2)(\\d{3})(\\d{3,4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["43[124-7]|70[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3",["43[124-7]|70[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["999"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["48|8[7-9]|9[08]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -704,7 +704,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"84\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BH",973,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"BH",973,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -719,7 +719,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BI",257,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BI",257,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -734,7 +734,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"857[58]\\d{4}","\\d{8}"]
-,"BJ",229,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"BJ",229,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -775,7 +775,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BN",673,"00",,,,,,,,[[,"([2-578]\\d{2})(\\d{4})","$1 $2",,"","",0]
+,"BN",673,"00",,,,,,,,[[,"([2-578]\\d{2})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -791,9 +791,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BO",591,"00(1\\d)?","0",,,"0(1\\d)?",,,,[[,"([234])(\\d{7})","$1 $2",["[234]"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"([67]\\d{7})","$1",["[67]"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -822,28 +822,28 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BR",55,"00(?:1[45]|2[135]|31|4[13])","0",,,"0(?:(1[245]|2[135]|31|4[13])(\\d{10,11}))?","$2",,,[[,"(\\d{4})(\\d{4})","$1-$2",["[2-9](?:[1-9]|0[1-9])"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1-$2",["9(?:[1-9]|0[1-9])"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{3,5})","$1",["1[125689]"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["(?:[189][1-9]|2[12478]|3[1-578]|7[13-579])9"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00"]
-,"","",0]
+]
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["(?:[189][1-9]|2[12478]|3[1-578]|7[13-579])9"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
-,"($1)","0 $CC ($1)",0]
+,"($1)","0 $CC ($1)"]
 ,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00"]
-,"","",0]
+]
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"[34]00\\d{5}","\\d{8}"]
@@ -872,9 +872,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BT",975,"00",,,,,,,,[[,"([17]7)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1|77"]
-,"","",0]
+]
 ,[,"([2-8])(\\d{3})(\\d{3})","$1 $2 $3",["[2-68]|7[246]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -890,11 +890,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"79[12][01]\\d{4}","\\d{8}"]
 ,"BW",267,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-6]"]
-,"","",0]
+]
 ,[,"(7\\d)(\\d{3})(\\d{3})","$1 $2 $3",["7"]
-,"","",0]
+]
 ,[,"(90)(\\d{5})","$1 $2",["9"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -910,19 +910,19 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"249\\d{6}","\\d{9}"]
 ,"BY",375,"810","8",,,"8?0?",,"8~10",,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["17[0-3589]|2[4-9]|[34]","17(?:[02358]|1[0-2]|9[0189])|2[4-9]|[34]"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["1(?:5[24]|6[235]|7[467])|2(?:1[246]|2[25]|3[26])","1(?:5[24]|6(?:2|3[04-9]|5[0346-9])|7(?:[46]|7[37-9]))|2(?:1[246]|2[25]|3[26])"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{3})","$1 $2-$3",["1(?:5[169]|6[3-5]|7[179])|2(?:1[35]|2[34]|3[3-5])","1(?:5[169]|6(?:3[1-3]|4|5[125])|7(?:1[3-9]|7[0-24-6]|9[2-7]))|2(?:1[35]|2[34]|3[3-5])"]
-,"8 0$1","",0]
+,"8 0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8[01]|9"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(82\\d)(\\d{4})(\\d{4})","$1 $2 $3",["82"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(800)(\\d{3})","$1 $2",["800"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(800)(\\d{2})(\\d{2,4})","$1 $2 $3",["800"]
-,"8 $1","",0]
+,"8 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8(?:[013]|[12]0)\\d{8}|800\\d{3,7}|902\\d{7}","\\d{6,11}"]
@@ -938,9 +938,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"BZ",501,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1-$2",["[2-8]"]
-,"","",0]
+]
 ,[,"(0)(800)(\\d{4})(\\d{3})","$1-$2-$3-$4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -982,13 +982,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CD",243,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["12"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8[0-2459]|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["88"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["[1-6]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1003,7 +1003,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CF",236,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"CF",236,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1019,9 +1019,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CG",242,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[02]"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["8"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1037,11 +1037,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"878\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"CH",41,"00","0",,,"0",,,,[[,"([2-9]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-7]|[89]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8[047]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["860"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"74[0248]\\d{6}","\\d{9}"]
 ,,,[,,"NA","NA"]
@@ -1056,7 +1056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CI",225,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"CI",225,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1071,7 +1071,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CK",682,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1 $2",,"","",0]
+,"CK",682,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1087,40 +1087,40 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"44\\d{7}","\\d{9}"]
 ,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["2[23]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(9)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(44)(\\d{3})(\\d{4})","$1 $2 $3",["44"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([68]00)(\\d{3})(\\d{3,4})","$1 $2 $3",["60|8"]
-,"$1","",0]
+,"$1"]
 ,[,"(600)(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3 $4",["60"]
-,"$1","",0]
+,"$1"]
 ,[,"(1230)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["219"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{4,5})","$1",["[1-9]"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["2[23]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ,[,"(9)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(44)(\\d{3})(\\d{4})","$1 $2 $3",["44"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([68]00)(\\d{3})(\\d{3,4})","$1 $2 $3",["60|8"]
-,"$1","",0]
+,"$1"]
 ,[,"(600)(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3 $4",["60"]
-,"$1","",0]
+,"$1"]
 ,[,"(1230)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["219"]
-,"($1)","$CC ($1)",0]
+,"($1)","$CC ($1)"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"600\\d{7,8}","\\d{10,11}"]
@@ -1136,11 +1136,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CM",237,"00",,,,,,,,[[,"([26])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[26]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[23]|88"]
-,"","",0]
+]
 ,[,"(800)(\\d{2})(\\d{3})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1158,15 +1158,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"CN",86,"(1(?:[129]\\d{3}|79\\d{2}))?00","0",,,"(1(?:[129]\\d{3}|79\\d{2}))|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
-,"","",0]
+]
 ,[,"(\\d{5,6})","$1",["100|95"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,6})","$1 $2",["(?:10|2\\d)[19]","(?:10|2\\d)(?:10|9[56])","(?:10|2\\d)(?:100|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3,4})(\\d{4})","$1 $2",["[2-9]"]
-,"","",0]
+]
 ,[,"(21)(\\d{4})(\\d{4,6})","$1 $2 $3",["21"]
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
@@ -1176,20 +1176,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
-,"","",0]
+]
 ]
 ,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,6})","$1 $2",["(?:10|2\\d)[19]","(?:10|2\\d)(?:10|9[56])","(?:10|2\\d)(?:100|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|9[56])"]
-,"0$1","$CC $1",0]
+,"0$1","$CC $1"]
 ,[,"(21)(\\d{4})(\\d{4,6})","$1 $2 $3",["21"]
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
@@ -1199,11 +1199,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
-,"","",0]
+]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"(?:4|(?:10)?8)00\\d{7}|950\\d{7,8}","\\d{10,12}"]
@@ -1219,16 +1219,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CO",57,"00(?:4(?:[14]4|56)|[579])","0",,,"0([3579]|4(?:44|56))?",,,,[[,"(\\d)(\\d{7})","$1 $2",["1(?:8[2-9]|9[0-3]|[2-7])|[24-8]","1(?:8[2-9]|9(?:09|[1-3])|[2-7])|[24-8]"]
-,"($1)","0$CC $1",0]
+,"($1)","0$CC $1"]
 ,[,"(\\d{3})(\\d{7})","$1 $2",["3"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"(1)(\\d{3})(\\d{7})","$1-$2-$3",["1(?:80|9[04])","1(?:800|9(?:0[01]|4[78]))"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d)(\\d{7})","$1 $2",["1(?:8[2-9]|9[0-3]|[2-7])|[24-8]","1(?:8[2-9]|9(?:09|[1-3])|[2-7])|[24-8]"]
-,"($1)","0$CC $1",0]
+,"($1)","0$CC $1"]
 ,[,"(\\d{3})(\\d{7})","$1 $2",["3"]
-,"","0$CC $1",0]
+,,"0$CC $1"]
 ,[,"(1)(\\d{3})(\\d{7})","$1 $2 $3",["1(?:80|9[04])","1(?:800|9(?:0[01]|4[78]))"]
 ]
 ]
@@ -1246,9 +1246,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"210[0-6]\\d{4}|4\\d{7}|5100\\d{4}","\\d{8}"]
 ,"CR",506,"00",,,,"(19(?:0[012468]|1[09]|20|66|77|99))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1264,11 +1264,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CU",53,"119","0",,,"0",,,,[[,"(\\d)(\\d{6,7})","$1 $2",["7"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{4,6})","$1 $2",["[2-4]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d)(\\d{7})","$1 $2",["5"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1283,7 +1283,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CV",238,"0",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"CV",238,"0",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1299,9 +1299,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"CW",599,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[13-7]"]
-,"","",0]
+]
 ,[,"(9)(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"","",0]
+]
 ]
 ,,[,,"955\\d{5}","\\d{7,8}"]
 ,1,,[,,"NA","NA"]
@@ -1329,7 +1329,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[1-9]\\d{5}","\\d{8}"]
 ,[,,"700\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
-,"CY",357,"00",,,,,,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"","",0]
+,"CY",357,"00",,,,,,,,[[,"(\\d{2})(\\d{6})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1345,11 +1345,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70[01]\\d{6}","\\d{9,12}"]
 ,[,,"9[17]0\\d{6}","\\d{9,12}"]
 ,"CZ",420,"00",,,,,,,,[[,"([2-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-8]|9[015-7]"]
-,"","",0]
+]
 ,[,"(96\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["96"]
-,"","",0]
+]
 ,[,"(9\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["9[36]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1365,37 +1365,37 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{8}","\\d{11}"]
 ,[,,"NA","NA"]
 ,"DE",49,"00","0",,,"0",,,,[[,"(1\\d{2})(\\d{7,8})","$1 $2",["1[67]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(15\\d{3})(\\d{6})","$1 $2",["15[0568]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{3})(\\d{7})","$1 $2",["15"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,11})","$1 $2",["3[02]|40|[68]9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3,11})","$1 $2",["2(?:\\d1|0[2389]|1[24]|28|34)|3(?:[3-9][15]|40)|[4-8][1-9]1|9(?:06|[1-9]1)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{2,11})","$1 $2",["[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])","[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:3(?:0[1-467]|2[127-9]|3[124578]|[46][1246]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|3[1357]|4[13578]|6[1246]|7[1356]|9[1346])|5(?:0[14]|2[1-3589]|3[1357]|4[1246]|6[1-4]|7[1346]|8[13568]|9[1246])|6(?:0[356]|2[1-489]|3[124-6]|4[1347]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|3[1357]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|4[1347]|6[0135-9]|7[1467]|8[136])|9(?:0[12479]|2[1358]|3[1357]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(3\\d{4})(\\d{1,10})","$1 $2",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{7,12})","$1 $2",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(177)(99)(\\d{7,8})","$1 $2 $3",["177","1779","17799"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d)(\\d{4,10})","$1 $2 $3",["(?:18|90)0|137","1(?:37|80)|900[1359]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{2})(\\d{5,11})","$1 $2",["181"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d{3})(\\d{6})","$1 $2",["185","1850","18500"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d{2})(\\d{7})","$1 $2",["18[68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(18\\d)(\\d{8})","$1 $2",["18[2-579]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(700)(\\d{4})(\\d{4})","$1 $2 $3",["700"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(138)(\\d{4})","$1 $2",["138"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"16(?:4\\d{1,10}|[89]\\d{1,11})","\\d{4,14}"]
 ,,,[,,"NA","NA"]
@@ -1410,7 +1410,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"DJ",253,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"DJ",253,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1425,7 +1425,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"DK",45,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"DK",45,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1467,11 +1467,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"98[23]\\d{6}","\\d{9}"]
 ,"DZ",213,"00","0",,,"0",,,,[[,"([1-4]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([5-8]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1487,18 +1487,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"[2-7]890\\d{4}","\\d{8}"]
 ,"EC",593,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2-$3",["[247]|[356][2-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{3,4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,[[,"(\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[247]|[356][2-8]"]
 ]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{3,4})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1514,13 +1514,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70[0-2]\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,"EE",372,"00",,,,,,,,[[,"([3-79]\\d{2})(\\d{4})","$1 $2",["[369]|4[3-8]|5(?:[0-2]|5[0-478]|6[45])|7[1-9]","[369]|4[3-8]|5(?:[02]|1(?:[0-8]|95)|5[0-478]|6(?:4[0-4]|5[1-589]))|7[1-9]"]
-,"","",0]
+]
 ,[,"(70)(\\d{2})(\\d{4})","$1 $2 $3",["70"]
-,"","",0]
+]
 ,[,"(8000)(\\d{3})(\\d{3})","$1 $2 $3",["800","8000"]
-,"","",0]
+]
 ,[,"([458]\\d{3})(\\d{3,4})","$1 $2",["40|5|8(?:00|[1-5])","40|5|8(?:00[1-9]|[1-5])"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1\\d{3,4}|800[2-9]\\d{3}","\\d{4,7}"]
@@ -1536,11 +1536,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"EG",20,"00","0",,,"0",,,,[[,"(\\d)(\\d{7,8})","$1 $2",["[23]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1[012]|[89]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{6,7})","$1 $2",["1[35]|[4-6]|[89][2-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1568,7 +1568,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ER",291,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"0$1","",0]
+,"ER",291,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1584,9 +1584,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"ES",34,"00",,,,,,,,[[,"([89]00)(\\d{3})(\\d{3})","$1 $2 $3",["[89]00"]
-,"","",0]
+]
 ,[,"([5-9]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[568]|[79][0-8]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1601,7 +1601,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ET",251,"00","0",,,"0",,,,[[,"([1-59]\\d)(\\d{3})(\\d{4})","$1 $2 $3",,"0$1","",0]
+,"ET",251,"00","0",,,"0",,,,[[,"([1-59]\\d)(\\d{3})(\\d{4})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1617,11 +1617,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"FI",358,"00|99[049]","0",,,"0",,,,[[,"(\\d{3})(\\d{3,7})","$1 $2",["(?:[1-3]00|[6-8]0)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4,10})","$1 $2",["[14]|2[09]|50|7[135]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4,11})","$1 $2",["[25689][1-8]|3"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"[13]00\\d{3,7}|2(?:0(?:0\\d{3,7}|2[023]\\d{1,6}|9[89]\\d{1,6}))|60(?:[12]\\d{5,6}|6\\d{7})|7(?:1\\d{7}|3\\d{8}|5[03-9]\\d{2,7})","\\d{5,10}"]
@@ -1637,9 +1637,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"FJ",679,"0(?:0|52)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1 $2",["[36-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1667,7 +1667,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"FM",691,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"FM",691,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1682,7 +1682,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"(?:6[0-36]|88)\\d{4}","\\d{6}"]
-,"FO",298,"00",,,,"(10(?:01|[12]0|88))",,,,[[,"(\\d{6})","$1",,"","$CC $1",0]
+,"FO",298,"00",,,,"(10(?:01|[12]0|88))",,,,[[,"(\\d{6})","$1",,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1698,16 +1698,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"9\\d{8}","\\d{9}"]
 ,"FR",33,"00","0",,,"0",,,,[[,"([1-79])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[1-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{2})(\\d{3})","$1 $2",["11"]
-,"$1","",0]
+,"$1"]
 ,[,"(8\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,[[,"([1-79])(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["[1-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"0 $1","",0]
+,"0 $1"]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1723,9 +1723,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GA",241,"00",,,,,,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1741,25 +1741,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{8}","\\d{10}"]
 ,[,,"56\\d{8}","\\d{10}"]
 ,"GB",44,"00","0"," x",,"0",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["2|5[56]|7(?:0|6[013-9])","2|5[56]|7(?:0|6(?:[013-9]|2[0-35-9]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1(?:1|\\d1)|3|9[018]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{5})(\\d{4,5})","$1 $2",["1(?:38|5[23]|69|76|94)","1(?:387|5(?:24|39)|697|768|946)","1(?:3873|5(?:242|39[456])|697[347]|768[347]|9467)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d{3})(\\d{5,6})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{3})(\\d{6})","$1 $2",["7(?:[1-5789]|62)","7(?:[1-5789]|624)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{4})","$1 $2",["800","8001","80011","800111","8001111"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(845)(46)(4\\d)","$1 $2 $3",["845","8454","84546","845464"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8(?:4[2-5]|7[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]00)(\\d{6})","$1 $2",["[58]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}","\\d{10}"]
 ,1,,[,,"NA","NA"]
@@ -1788,11 +1788,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"706\\d{6}","\\d{9}"]
 ,"GE",995,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[348]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["5"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"706\\d{6}","\\d{9}"]
@@ -1807,7 +1807,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GF",594,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"GF",594,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1836,9 +1836,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GH",233,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[235]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"800\\d{5}","\\d{8}"]
@@ -1854,7 +1854,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GI",350,"00",,,,,,,,[[,"(\\d{3})(\\d{5})","$1 $2",["2"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1869,7 +1869,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"3[89]\\d{4}","\\d{6}"]
-,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1884,7 +1884,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GM",220,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"GM",220,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1900,9 +1900,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"722\\d{6}","\\d{9}"]
 ,"GN",224,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["3"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[67]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1917,7 +1917,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GP",590,"00","0",,,"0",,,,[[,"([56]90)(\\d{2})(\\d{4})","$1 $2-$3",,"0$1","",0]
+,"GP",590,"00","0",,,"0",,,,[[,"([56]90)(\\d{2})(\\d{4})","$1 $2-$3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -1933,9 +1933,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GQ",240,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[235]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["[89]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1951,11 +1951,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{8}","\\d{10}"]
 ,[,,"NA","NA"]
 ,"GR",30,"00",,,,,,,,[[,"([27]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["21|7"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["2[2-9]1|[689]"]
-,"","",0]
+]
 ,[,"(2\\d{3})(\\d{6})","$1 $2",["2[2-9][02-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -1971,9 +1971,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"GT",502,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[2-7]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2002,9 +2002,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"40\\d{5}","\\d{7,9}"]
 ,"GW",245,"00",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["44|9[567]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["40"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2019,7 +2019,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"GY",592,"001",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"GY",592,"001",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2035,13 +2035,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8[1-3]\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,"HK",852,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[235-7]|[89](?:0[1-9]|[1-9])"]
-,"","",0]
+]
 ,[,"(800)(\\d{3})(\\d{3})","$1 $2 $3",["800"]
-,"","",0]
+]
 ,[,"(900)(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3 $4",["900"]
-,"","",0]
+]
 ,[,"(900)(\\d{2,5})","$1 $2",["900"]
-,"","",0]
+]
 ]
 ,,[,,"7\\d{7}","\\d{8}"]
 ,,,[,,"NA","NA"]
@@ -2056,7 +2056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"HN",504,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1-$2",,"","",0]
+,"HN",504,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1-$2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2072,27 +2072,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"7[45]\\d{4,7}","\\d{6,9}"]
 ,[,,"NA","NA"]
 ,"HR",385,"00","0",,,"0",,,,[[,"(1)(\\d{4})(\\d{3})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6[09])(\\d{4})(\\d{3})","$1 $2 $3",["6[09]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([67]2)(\\d{3})(\\d{3,4})","$1 $2 $3",["[67]2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-5]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{4})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d)(\\d{3,4})(\\d{3})(\\d{3})","$1 $2 $3 $4",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2,3})","$1 $2 $3",["6[0145]|7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,4})(\\d{3})","$1 $2 $3",["6[0145]|7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80[01])(\\d{2})(\\d{2,3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80[01])(\\d{3,4})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2107,7 +2107,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"98[89]\\d{5}","\\d{8}"]
-,"HT",509,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",,"","",0]
+,"HT",509,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2123,9 +2123,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"HU",36,"00","06",,,"06",,,,[[,"(1)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"($1)","",0]
+,"($1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-9]"]
-,"($1)","",0]
+,"($1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"[48]0\\d{6}","\\d{8}"]
@@ -2141,17 +2141,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ID",62,"0(?:0[1789]|10(?:00|1[67]))","0",,,"0",,,,[[,"(\\d{2})(\\d{5,8})","$1 $2",["2[124]|[36]1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5,8})","$1 $2",["[4579]|2[035-9]|[36][02-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(8\\d{2})(\\d{3,4})(\\d{3,5})","$1-$2-$3",["8[1-35-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(177)(\\d{6,8})","$1 $2",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{5,7})","$1 $2",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d)(\\d{3})(\\d{3})","$1 $2 $3 $4",["80[79]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8071\\d{6}","\\d{10}"]
@@ -2167,23 +2167,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{6}","\\d{9}"]
 ,[,,"76\\d{7}","\\d{9}"]
 ,"IE",353,"00","0",,,"0",,,,[[,"(1)(\\d{3,4})(\\d{4})","$1 $2 $3",["1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["2[24-9]|47|58|6[237-9]|9[35-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["40[24]|50[45]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(48)(\\d{4})(\\d{4})","$1 $2 $3",["48"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(818)(\\d{3})(\\d{3})","$1 $2 $3",["81"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[24-69]|7[14]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([78]\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["76|8[35-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(700)(\\d{3})(\\d{3})","$1 $2 $3",["70"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:8[059]|5)","1(?:8[059]0|5)"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"18[59]0\\d{6}","\\d{10}"]
@@ -2199,21 +2199,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"7(?:18\\d|2[23]\\d|3[237]\\d|47\\d|6(?:5\\d|8[0168])|7\\d{2}|8(?:2\\d|33|55|77|81)|99\\d)\\d{5}","\\d{9}"]
 ,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([57]\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[57]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1)([7-9]\\d{2})(\\d{3})(\\d{3})","$1-$2-$3-$4",["1[7-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"(1255)(\\d{3})","$1-$2",["125"]
-,"$1","",0]
+,"$1"]
 ,[,"(1200)(\\d{3})(\\d{3})","$1-$2-$3",["120"]
-,"$1","",0]
+,"$1"]
 ,[,"(1212)(\\d{2})(\\d{2})","$1-$2-$3",["121"]
-,"$1","",0]
+,"$1"]
 ,[,"(1599)(\\d{6})","$1-$2",["15"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})","*$1",["[2-689]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1700\\d{6}|[2-689]\\d{3}","\\d{4,10}"]
@@ -2242,27 +2242,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[0257]|3[0157-9]|4[0-389]|6[0-35-9]|8[0-79])|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[02457-9]|7[01-69]|8[0-24-9]|9[02-9])|9","7(?:0|2(?:[0235679]|[14][017-9]|8[0-59]|9[389])|3(?:[058]|10|7[3679]|9[689])|4(?:0[1-9]|1[015-9]|[29][89]|39|8[389])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8[0-79])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1(?:2[0-249]|3[0-25]|4[145]|[569][14]|7[1257]|8[1346]|[68][1-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|[36][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)","7(?:12|2[14]|3[134]|4[47]|5(?:1|5[2-6])|[67]1|88)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:[23579]|[468][1-9])|[2-8]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1600)(\\d{2})(\\d{4})","$1 $2 $3",["160","1600"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(1800)(\\d{4,5})","$1 $2",["180","1800"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(18[06]0)(\\d{2,4})(\\d{4})","$1 $2 $3",["18[06]","18[06]0"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(140)(\\d{3})(\\d{4})","$1 $2 $3",["140"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(\\d{4})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["18[06]","18(?:0[03]|6[12])"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1(?:600\\d{6}|8(?:0(?:0\\d{4,9}|3\\d{9})|6(?:0\\d{7}|[12]\\d{9})))","\\d{8,13}"]
@@ -2277,7 +2277,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IO",246,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"IO",246,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2293,11 +2293,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"IQ",964,"00","0",,,"0",,,,[[,"(1)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-6]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2313,15 +2313,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"(?:[2-6]0\\d|993)\\d{7}","\\d{10}"]
 ,"IR",98,"00","0",,,"0",,,,[[,"(21)(\\d{3,5})","$1 $2",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["[1-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})","$1 $2",["9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"943\\d{7}","\\d{10}"]
 ,,,[,,"NA","NA"]
@@ -2337,9 +2337,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"49\\d{5}","\\d{7}"]
 ,"IS",354,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-9]"]
-,"","",0]
+]
 ,[,"(3\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2355,25 +2355,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"1(?:78\\d|99)\\d{6}","\\d{9,10}"]
 ,[,,"55\\d{8}","\\d{10}"]
 ,"IT",39,"00",,,,,,,,[[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["0[26]|55"]
-,"","",0]
+]
 ,[,"(0[26])(\\d{4})(\\d{5})","$1 $2 $3",["0[26]"]
-,"","",0]
+]
 ,[,"(0[26])(\\d{4,6})","$1 $2",["0[26]"]
-,"","",0]
+]
 ,[,"(0\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["0[13-57-9][0159]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["0[13-57-9][0159]|8(?:03|4[17]|9[245])","0[13-57-9][0159]|8(?:03|4[17]|9(?:2|[45][0-4]))"]
-,"","",0]
+]
 ,[,"(0\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["0[13-57-9][2-46-8]"]
-,"","",0]
+]
 ,[,"(0\\d{3})(\\d{2,6})","$1 $2",["0[13-57-9][2-46-8]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[13]|8(?:00|4[08]|9[59])","[13]|8(?:00|4[08]|9(?:5[5-9]|9))"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["894","894[5-9]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"848\\d{6}","\\d{9}"]
@@ -2415,11 +2415,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"JO",962,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[2356]|87"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(7)(\\d{4})(\\d{4})","$1 $2 $3",["7[457-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{5,6})","$1 $2",["70|8[0158]|9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"74(?:66|77)\\d{5}","\\d{9}"]
 ,,,[,,"NA","NA"]
@@ -2435,56 +2435,56 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"60\\d{7}","\\d{9}"]
 ,[,,"50[1-9]\\d{7}","\\d{10}"]
 ,"JP",81,"010","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1-$2-$3",["(?:12|57|99)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["0077"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{3,4})","$1-$2-$3",["0077"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1-$2-$3",["0088"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{3})(\\d{3,4})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{4})(\\d{4,5})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{5})(\\d{5,6})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{4})(\\d{6})(\\d{6,7})","$1-$2-$3",["00(?:37|66)"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["[2579]0|80[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1-$2-$3",["1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|5(?:76|97)|499|746|8(?:3[89]|63|47|51)|9(?:49|80|9[16])","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:76|97)9|499[2468]|7468|8(?:3(?:8[78]|96)|636|477|51[24])|9(?:496|802|9(?:1[23]|69))","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:769|979[2-69])|499[2468]|7468|8(?:3(?:8[78]|96[2457-9])|636[2-57-9]|477|51[24])|9(?:496|802|9(?:1[23]|69))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["1(?:2[3-6]|3[3-9]|4[2-6]|5[2-8]|[68][2-7]|7[2-689]|9[1-578])|2(?:2[03-689]|3[3-58]|4[0-468]|5[04-8]|6[013-8]|7[06-9]|8[02-57-9]|9[13])|4(?:2[28]|3[689]|6[035-7]|7[05689]|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9[4-9])|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9[014-9])|8(?:2[49]|3[3-8]|4[5-8]|5[2-9]|6[35-9]|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9[3-7])","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9[2-8])|3(?:7[2-6]|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5[4-7]|6[2-9]|8[2-8]|9[236-9])|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3[34]|[4-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6[56]))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6(?:5[25]|60)))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["1|2(?:2[37]|5[5-9]|64|78|8[39]|91)|4(?:2[2689]|64|7[347])|5(?:[2-589]|39)|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93)","1|2(?:2[37]|5(?:[57]|[68]0|9[19])|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93[34])","1|2(?:2[37]|5(?:[57]|[68]0|9(?:17|99))|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93(?:31|4))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["2(?:9[14-79]|74|[34]7|[56]9)|82|993"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1-$2-$3",["3|4(?:2[09]|7[01])|6[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[2479][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(\\d{3})(\\d{3})(\\d{3})","$1-$2-$3",["(?:12|57|99)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["800"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["[2579]0|80[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1-$2-$3",["1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|5(?:76|97)|499|746|8(?:3[89]|63|47|51)|9(?:49|80|9[16])","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:76|97)9|499[2468]|7468|8(?:3(?:8[78]|96)|636|477|51[24])|9(?:496|802|9(?:1[23]|69))","1(?:267|3(?:7[247]|9[278])|4(?:5[67]|66)|5(?:47|58|64|8[67])|6(?:3[245]|48|5[4-68]))|5(?:769|979[2-69])|499[2468]|7468|8(?:3(?:8[78]|96[2457-9])|636[2-57-9]|477|51[24])|9(?:496|802|9(?:1[23]|69))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["1(?:2[3-6]|3[3-9]|4[2-6]|5[2-8]|[68][2-7]|7[2-689]|9[1-578])|2(?:2[03-689]|3[3-58]|4[0-468]|5[04-8]|6[013-8]|7[06-9]|8[02-57-9]|9[13])|4(?:2[28]|3[689]|6[035-7]|7[05689]|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9[4-9])|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9[014-9])|8(?:2[49]|3[3-8]|4[5-8]|5[2-9]|6[35-9]|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9[3-7])","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9[2-8])|3(?:7[2-6]|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5[4-7]|6[2-9]|8[2-8]|9[236-9])|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3[34]|[4-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6[56]))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))","1(?:2[3-6]|3[3-9]|4[2-6]|5(?:[236-8]|[45][2-69])|[68][2-7]|7[2-689]|9[1-578])|2(?:2(?:[04-689]|3[23])|3[3-58]|4[0-468]|5(?:5[78]|7[2-4]|[0468][2-9])|6(?:[0135-8]|4[2-5])|7(?:[0679]|8[2-7])|8(?:[024578]|3[25-9]|9[6-9])|9(?:11|3[2-4]))|4(?:2(?:2[2-9]|8[237-9])|3[689]|6[035-7]|7(?:[059][2-8]|[68])|80|9[3-5])|5(?:3[1-36-9]|4[4578]|5[013-8]|6[1-9]|7[2-8]|8[14-7]|9(?:[89][2-8]|[4-7]))|7(?:2[15]|3[5-9]|4[02-9]|6[135-8]|7[0-4689]|9(?:[017-9]|4[6-8]|5[2-478]|6[2-589]))|8(?:2(?:4[4-8]|9(?:[3578]|20|4[04-9]|6(?:5[25]|60)))|3(?:7(?:[2-5]|6[0-59])|[3-6][2-9]|8[2-5])|4[5-8]|5[2-9]|6(?:[37]|5(?:[467]|5[014-9])|6(?:[2-8]|9[02-69])|8[2-8]|9(?:[236-8]|9[23]))|7[579]|8[03-579]|9[2-8])|9(?:[23]0|4[02-46-9]|5[024-79]|6[4-9]|7[2-47-9]|8[02-7]|9(?:3(?:3[02-9]|4[0-24689])|4[2-69]|[5-7]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["1|2(?:2[37]|5[5-9]|64|78|8[39]|91)|4(?:2[2689]|64|7[347])|5(?:[2-589]|39)|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93)","1|2(?:2[37]|5(?:[57]|[68]0|9[19])|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93[34])","1|2(?:2[37]|5(?:[57]|[68]0|9(?:17|99))|64|78|8[39]|917)|4(?:2(?:[68]|20|9[178])|64|7[347])|5(?:[2-589]|39[67])|60|8(?:[46-9]|3[279]|2[124589])|9(?:[235-8]|93(?:31|4))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["2(?:9[14-79]|74|[34]7|[56]9)|82|993"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{4})(\\d{4})","$1-$2-$3",["3|4(?:2[09]|7[01])|6[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[2479][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[,,"20\\d{8}","\\d{10}"]
 ,,,[,,"00(?:37\\d{6,13}|66\\d{6,13}|777(?:[01]\\d{2}|5\\d{3}|8\\d{4})|882[1245]\\d{4})","\\d{8,17}"]
@@ -2500,11 +2500,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KE",254,"000","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["[24-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2520,11 +2520,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KG",996,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[25-7]|31[25]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{5})","$1 $2",["3(?:1[36]|[2-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d)(\\d{3})","$1 $2 $3 $4",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2540,9 +2540,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KH",855,"00[14-9]","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["1\\d[1-9]|[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1[89]0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2570,7 +2570,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"KM",269,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"KM",269,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2599,11 +2599,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KP",850,"00|99","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"2(?:[0-24-9]\\d{2}|3(?:[0-79]\\d|8[02-9]))\\d{4}","\\d{8}"]
@@ -2619,25 +2619,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"50\\d{8}","\\d{10}"]
 ,[,,"70\\d{8}","\\d{10}"]
 ,"KR",82,"00(?:[124-68]|[37]\\d{2})","0",,,"0(8[1-46-8]|85\\d{2})?",,,,[[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["1(?:0|1[19]|[69]9|5[458])|[57]0","1(?:0|1[19]|[69]9|5(?:44|59|8))|[57]0"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{3,4})(\\d{4})","$1-$2-$3",["1(?:[169][2-8]|[78]|5[1-4])|[68]0|[3-6][1-9][1-9]","1(?:[169][2-8]|[78]|5(?:[1-3]|4[56]))|[68]0|[3-6][1-9][1-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d)(\\d{4})","$1-$2-$3",["131","1312"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["131","131[13-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["13[2-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3-$4",["30"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d)(\\d{3,4})(\\d{4})","$1-$2-$3",["2[1-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d)(\\d{3,4})","$1-$2",["21[0-46-9]"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{2})(\\d{3,4})","$1-$2",["[3-6][1-9]1","[3-6][1-9]1(?:[0-46-9])"]
-,"0$1","0$CC-$1",0]
+,"0$1","0$CC-$1"]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["1(?:5[46-9]|6[04678]|8[0579])","1(?:5(?:44|66|77|88|99)|6(?:00|44|6[16]|70|88)|8(?:00|55|77|99))"]
-,"$1","0$CC-$1",0]
+,"$1","0$CC-$1"]
 ]
 ,,[,,"15\\d{7,8}","\\d{9,10}"]
 ,,,[,,"NA","NA"]
@@ -2653,9 +2653,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"KW",965,"00",,,,,,,,[[,"(\\d{4})(\\d{3,4})","$1 $2",["[126]|9[04-9]|52[25]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["5[015]|92"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2697,11 +2697,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LA",856,"00","0",,,"0",,,,[[,"(20)(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3 $4",["20"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2-8]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["2[13]|3[14]|[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(30)(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["30"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2717,9 +2717,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LB",961,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[13-6]|7(?:[2-57]|62|8[0-7]|9[04-9])|8[02-9]|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([7-9]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[89][01]|7(?:[01]|6[013-9]|8[89]|9[1-3])"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2748,11 +2748,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23789]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6[56]"]
-,"","",0]
+]
 ,[,"(69)(7\\d{2})(\\d{4})","$1 $2 $3",["697"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2768,9 +2768,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"LK",94,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{1})(\\d{6})","$1 $2 $3",["[1-689]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2786,13 +2786,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"332(?:0[02]|5\\d)\\d{4}","\\d{9}"]
 ,"LR",231,"00","0",,,"0",,,,[[,"(2\\d)(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[2579]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([4-6])(\\d{3})(\\d{3})","$1 $2 $3",["[4-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[38]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2807,7 +2807,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LS",266,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"LS",266,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2823,13 +2823,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"700\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,"LT",370,"00","8",,,"[08]",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ,[,"([3-6]\\d{2})(\\d{5})","$1 $2",["3[148]|4(?:[24]|6[09])|528|6"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ,[,"([7-9]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[7-9]"]
-,"8 $1","",1]
+,"8 $1",,1]
 ,[,"(5)(2\\d{2})(\\d{4})","$1 $2 $3",["52[0-79]"]
-,"(8-$1)","",1]
+,"(8-$1)",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2845,23 +2845,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{6}","\\d{8}"]
 ,[,,"20(?:1\\d{5}|[2-689]\\d{1,7})","\\d{4,10}"]
 ,"LU",352,"00",,,,"(15(?:0[06]|1[12]|35|4[04]|55|6[26]|77|88|99)\\d)",,,,[[,"(\\d{2})(\\d{3})","$1 $2",["[2-5]|7[1-9]|[89](?:[1-9]|0[2-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["[2-5]|7[1-9]|[89](?:[1-9]|0[2-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["20"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4",["2(?:[0367]|4[3-8])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["20"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4 $5",["2(?:[0367]|4[3-8])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,4})","$1 $2 $3 $4",["2(?:[12589]|4[12])|[3-5]|7[1-9]|8(?:[1-9]|0[2-9])|9(?:[1-9]|0[2-46-9])"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["70|80[01]|90[015]"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6"]
-,"","$CC $1",0]
+,,"$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2876,7 +2876,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"81\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LV",371,"00",,,,,,,,[[,"([2689]\\d)(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"LV",371,"00",,,,,,,,[[,"([2689]\\d)(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2891,7 +2891,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"LY",218,"00","0",,,"0",,,,[[,"([25679]\\d)(\\d{7})","$1-$2",,"0$1","",0]
+,"LY",218,"00","0",,,"0",,,,[[,"([25679]\\d)(\\d{7})","$1-$2",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2907,13 +2907,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MA",212,"00","0",,,"0",,,,[[,"([56]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9])|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80))|892"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d{4})(\\d{4})","$1-$2",["5(?:29|38)","5(?:29|38)[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8[09])(\\d{7})","$1-$2",["8(?:0|9[013-9])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -2929,13 +2929,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MC",377,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"$1","",0]
+,"$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["4"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6)(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3",["8"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"8\\d{7}","\\d{8}"]
@@ -2951,11 +2951,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3[08]\\d{6}","\\d{8}"]
 ,"MD",373,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["22|3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([25-7]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["2[13-79]|[5-7]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{5})","$1 $2",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -2971,9 +2971,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"78[1-9]\\d{5}","\\d{8}"]
 ,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]","[2-57-9]|6(?:[03689]|7(?:[0-8]|9[3-9]))"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(67)(9)(\\d{3})(\\d{3})","$1 $2 $3 $4",["679","679[0-2]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3001,7 +3001,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"22\\d{7}","\\d{9}"]
-,"MG",261,"00","0",,,"0",,,,[[,"([23]\\d)(\\d{2})(\\d{3})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"MG",261,"00","0",,,"0",,,,[[,"([23]\\d)(\\d{2})(\\d{3})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3016,7 +3016,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"635\\d{4}","\\d{7}"]
-,"MH",692,"011","1",,,"1",,,,[[,"(\\d{3})(\\d{4})","$1-$2",,"","",0]
+,"MH",692,"011","1",,,"1",,,,[[,"(\\d{3})(\\d{4})","$1-$2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3032,11 +3032,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MK",389,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([347]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[347]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{2})(\\d)(\\d{2})(\\d{2})","$1 $2 $3 $4",["[58]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3052,12 +3052,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ML",223,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[246-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})","$1",["67|74"]
-,"","",0]
+]
 ]
 ,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[246-9]"]
-,"","",0]
+]
 ]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3073,23 +3073,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"1333\\d{4}","\\d{8}"]
 ,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["1|2[45]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2)(\\d{4})(\\d{4})","$1 $2 $3",["251"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["67|81"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{2})(\\d{3,4})","$1 $2 $3",["[4-8]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{4,6})","$1 $2 $3",["9(?:2[0-4]|[35-9]|4[137-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)([34]\\d{4})(\\d{4})","$1 $2 $3",["9(?:3[0-36]|4[0-57-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["92[56]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9)(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3 $4",["93"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3105,15 +3105,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"7[05-8]\\d{6}","\\d{8}"]
 ,"MN",976,"001","0",,,"0",,,,[[,"([12]\\d)(\\d{2})(\\d{4})","$1 $2 $3",["[12]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([12]2\\d)(\\d{5,6})","$1 $2",["[12]2[1-3]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([12]\\d{3})(\\d{5})","$1 $2",["[12](?:27|[3-5])","[12](?:27|[3-5]\\d)2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["[57-9]"]
-,"$1","",0]
+,"$1"]
 ,[,"([12]\\d{4})(\\d{4,5})","$1 $2",["[12](?:27|[3-5])","[12](?:27|[3-5]\\d)[4-9]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3128,7 +3128,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MO",853,"00",,,,,,,,[[,"([268]\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"MO",853,"00",,,,,,,,[[,"([268]\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3156,7 +3156,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MQ",596,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"MQ",596,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3171,7 +3171,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MR",222,"00",,,,,,,,[[,"([2-48]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"MR",222,"00",,,,,,,,[[,"([2-48]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3199,7 +3199,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"3550\\d{4}","\\d{8}"]
-,"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"7117\\d{4}","\\d{8}"]
 ,,,[,,"NA","NA"]
@@ -3215,9 +3215,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3(?:20|9\\d)\\d{4}","\\d{7}"]
 ,"MU",230,"0(?:0|[2-7]0|33)",,,,,,"020",,[[,"([2-46-9]\\d{2})(\\d{4})","$1 $2",["[2-46-9]"]
-,"","",0]
+]
 ,[,"(5\\d{3})(\\d{4})","$1 $2",["5"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3233,9 +3233,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MV",960,"0(?:0|19)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1-$2",["[3467]|9(?:[1-9]|0[1-9])"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["900"]
-,"","",0]
+]
 ]
 ,,[,,"781\\d{4}","\\d{7}"]
 ,,,[,,"NA","NA"]
@@ -3251,11 +3251,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MW",265,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[1789]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3271,18 +3271,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"500\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
 ,"MX",52,"0[09]","01",,,"0[12]|04[45](\\d{10})","1$1",,,[[,"([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)([358]\\d)(\\d{4})(\\d{4})","044 $2 $3 $4",["1(?:33|55|81)"]
-,"$1","",1]
+,"$1",,1]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","044 $2 $3 $4",["1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,[[,"([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["33|55|81"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[2467]|3[0-2457-9]|5[089]|8[02-9]|9[0-35-9]"]
-,"01 $1","",1]
+,"01 $1",,1]
 ,[,"(1)([358]\\d)(\\d{4})(\\d{4})","$1 $2 $3 $4",["1(?:33|55|81)"]
 ]
 ,[,"(1)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3 $4",["1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])"]
@@ -3302,17 +3302,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"154\\d{7}","\\d{10}"]
 ,"MY",60,"00","0",,,"0",,,,[[,"([4-79])(\\d{3})(\\d{4})","$1-$2 $3",["[4-79]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(3)(\\d{4})(\\d{4})","$1-$2 $3",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([18]\\d)(\\d{3})(\\d{3,4})","$1-$2 $3",["1[02-46-9][1-9]|8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1)([36-8]00)(\\d{2})(\\d{4})","$1-$2-$3-$4",["1[36-8]0"]
-,"","",0]
+]
 ,[,"(11)(\\d{4})(\\d{4})","$1-$2 $3",["11"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(15[49])(\\d{3})(\\d{4})","$1-$2 $3",["15"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3328,9 +3328,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"MZ",258,"00",,,,,,,,[[,"([28]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["2|8[2-7]"]
-,"","",0]
+]
 ,[,"(80\\d)(\\d{3})(\\d{3})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3346,13 +3346,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"8(?:3\\d{2}|86)\\d{5}","\\d{8,9}"]
 ,"NA",264,"00","0",,,"0",,,,[[,"(8\\d)(\\d{3})(\\d{4})","$1 $2 $3",["8[1235]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(88)(\\d{3})(\\d{3})","$1 $2 $3",["88"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(870)(\\d{3})(\\d{3})","$1 $2 $3",["870"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3368,7 +3368,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NC",687,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[2-46-9]|5[0-4]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3384,9 +3384,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NE",227,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[289]|09"]
-,"","",0]
+]
 ,[,"(08)(\\d{3})(\\d{3})","$1 $2 $3",["08"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3402,9 +3402,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NF",672,"00",,,,,,,,[[,"(\\d{2})(\\d{4})","$1 $2",["1"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{5})","$1 $2",["3"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3420,17 +3420,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NG",234,"009","0",,,"0",,,,[[,"([129])(\\d{3})(\\d{3,4})","$1 $2 $3",["[129]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[3-6]|7(?:[1-79]|0[1-9])|8[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2359]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([78]00)(\\d{4})(\\d{4,5})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([78]00)(\\d{5})(\\d{5,6})","$1 $2 $3",["[78]00"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(78)(\\d{2})(\\d{3})","$1 $2 $3",["78"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3445,7 +3445,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"NI",505,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"NI",505,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3461,17 +3461,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"85\\d{7}","\\d{9}"]
 ,"NL",31,"00","0",,,"0",,,,[[,"([1-578]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1[035]|2[0346]|3[03568]|4[0356]|5[0358]|7|8[4578]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-5]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["1[16-8]|2[259]|3[124]|4[17-9]|5[124679]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6)(\\d{8})","$1 $2",["6[0-57-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(66)(\\d{7})","$1 $2",["66"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(14)(\\d{3,4})","$1 $2",["14"]
-,"$1","",0]
+,"$1"]
 ,[,"([89]0\\d)(\\d{4,7})","$1 $2",["80|9"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"66\\d{7}","\\d{9}"]
 ,,,[,,"14\\d{3,4}","\\d{5,6}"]
@@ -3487,9 +3487,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"880\\d{5}","\\d{8}"]
 ,[,,"85[0-5]\\d{5}","\\d{8}"]
 ,"NO",47,"00",,,,,,,,[[,"([489]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[489]"]
-,"","",0]
+]
 ,[,"([235-7]\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[235-7]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -3505,11 +3505,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"NP",977,"00","0",,,"0",,,,[[,"(1)(\\d{7})","$1-$2",["1[2-6]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{6})","$1-$2",["1[01]|[2-8]|9(?:[1-69]|7[15-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9\\d{2})(\\d{7})","$1-$2",["9(?:6[013]|7[245]|8)"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3524,7 +3524,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3553,17 +3553,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[346]|7[2-57-9]|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(24099)(\\d{3})","$1 $2",["240","2409","24099"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|70|86"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["2[028]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:10|74)|5|[89]0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"[28]6\\d{6,7}","\\d{8,9}"]
 ,,,[,,"NA","NA"]
@@ -3579,11 +3579,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"OM",968,"00",,,,,,,,[[,"(2\\d)(\\d{6})","$1 $2",["2"]
-,"","",0]
+]
 ,[,"(9\\d{3})(\\d{4})","$1 $2",["9"]
-,"","",0]
+]
 ,[,"([58]00)(\\d{4,6})","$1 $2",["[58]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3599,9 +3599,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PA",507,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1-$2",["[1-57-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1-$2",["6"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3617,13 +3617,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[24]\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,"PE",51,"19(?:1[124]|77|90)00","0"," Anexo ",,"0",,,,[[,"(1)(\\d{7})","$1 $2",["1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([4-8]\\d)(\\d{6})","$1 $2",["[4-7]|8[2-4]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["80"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(9\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3639,9 +3639,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["4[09]|8[79]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["44"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"44\\d{4}","\\d{6}"]
@@ -3657,9 +3657,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"275\\d{4}","\\d{7}"]
 ,"PG",675,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[13-689]|27"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["20|7"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3675,21 +3675,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PH",63,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(2)(\\d{5})","$1 $2",["2"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{4})(\\d{4,6})","$1 $2",["3(?:23|39|46)|4(?:2[3-6]|[35]9|4[26]|76)|5(?:22|44)|642|8(?:62|8[245])","3(?:230|397|461)|4(?:2(?:35|[46]4|51)|396|4(?:22|63)|59[347]|76[15])|5(?:221|446)|642[23]|8(?:622|8(?:[24]2|5[13]))"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{5})(\\d{4})","$1 $2",["346|4(?:27|9[35])|883","3469|4(?:279|9(?:30|56))|8834"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([3-8]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[3-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["81|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1800)(\\d{3})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ,[,"(1800)(\\d{1,2})(\\d{3})(\\d{4})","$1 $2 $3 $4",["1"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3705,21 +3705,21 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"122\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"PK",92,"00","0",,,"0",,,,[[,"(\\d{2})(111)(\\d{3})(\\d{3})","$1 $2 $3 $4",["(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)1","(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)11","(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)111"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(111)(\\d{3})(\\d{3})","$1 $2 $3 $4",["2[349]|45|54|60|72|8[2-5]|9[2-9]","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d1","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d11","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d111"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{2})(\\d{7,8})","$1 $2",["(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{6,7})","$1 $2",["2[349]|45|54|60|72|8[2-5]|9[2-9]","(?:2[349]|45|54|60|72|8[2-5]|9[2-9])\\d[2-9]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(3\\d{2})(\\d{7})","$1 $2",["3"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([15]\\d{3})(\\d{5,6})","$1 $2",["58[12]|1"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"(586\\d{2})(\\d{5})","$1 $2",["586"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([89]00)(\\d{3})(\\d{2})","$1 $2 $3",["[89]00"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3735,15 +3735,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"39\\d{7}","\\d{9}"]
 ,"PL",48,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[14]|2[0-57-9]|3[2-4]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{1})(\\d{4})","$1 $2 $3",["[12]2"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["26|39|5[0137]|6[0469]|7[02389]|8[08]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["64"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{3})","$1 $2",["64"]
-,"","",0]
+]
 ]
 ,,[,,"64\\d{4,7}","\\d{6,9}"]
 ,,,[,,"NA","NA"]
@@ -3758,7 +3758,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"PM",508,"00","0",,,"0",,,,[[,"([45]\\d)(\\d{2})(\\d{2})","$1 $2 $3",,"0$1","",0]
+,"PM",508,"00","0",,,"0",,,,[[,"([45]\\d)(\\d{2})(\\d{2})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3787,11 +3787,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PS",970,"00","0",,,"0",,,,[[,"([2489])(2\\d{2})(\\d{4})","$1 $2 $3",["[2489]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5[69]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[78]00)(\\d{3})(\\d{3})","$1 $2 $3",["1[78]"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3807,9 +3807,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"884[0-4689]\\d{5}","\\d{9}"]
 ,[,,"30\\d{7}","\\d{9}"]
 ,"PT",351,"00",,,,,,,,[[,"(2\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2[12]"]
-,"","",0]
+]
 ,[,"([2-46-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2[3-9]|[346-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3824,7 +3824,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"PW",680,"01[12]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"PW",680,"01[12]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3840,15 +3840,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"8700[0-4]\\d{4}","\\d{9}"]
 ,"PY",595,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["(?:[26]1|3[289]|4[124678]|7[123]|8[1236])"]
-,"($1)","",0]
+,"($1)"]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["[2-9]0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8700"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4,6})","$1 $2",["[2-8][1-9]"]
-,"($1)","",0]
+,"($1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3864,9 +3864,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"QA",974,"00",,,,,,,,[[,"([28]\\d{2})(\\d{4})","$1 $2",["[28]"]
-,"","",0]
+]
 ,[,"([3-7]\\d{3})(\\d{4})","$1 $2",["[3-7]"]
-,"","",0]
+]
 ]
 ,,[,,"2(?:[12]\\d|61)\\d{4}","\\d{7}"]
 ,,,[,,"NA","NA"]
@@ -3881,7 +3881,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+,"RE",262,"00","0",,,"0",,,,[[,"([268]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,1,"262|6[49]|8",[,,"NA","NA"]
@@ -3897,13 +3897,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"802\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"RO",40,"00","0"," int ",,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[23]1"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(21)(\\d{4})","$1 $2",["21"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3919,17 +3919,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RS",381,"00","0",,,"0",,,,[[,"([23]\\d{2})(\\d{4,9})","$1 $2",["(?:2[389]|39)0"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-3]\\d)(\\d{5,10})","$1 $2",["1|2(?:[0-24-7]|[389][1-9])|3(?:[0-8]|9[1-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(6\\d)(\\d{6,8})","$1 $2",["6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3,9})","$1 $2",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7[26])(\\d{4,9})","$1 $2",["7[26]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7[08]\\d)(\\d{4,9})","$1 $2",["7[08]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3945,16 +3945,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RU",7,"810","8",,,"8",,"8~10",,[[,"(\\d{3})(\\d{2})(\\d{2})","$1-$2-$3",["[1-79]"]
-,"$1","",1]
+,"$1",,1]
 ,[,"([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["[34689]"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ]
 ,[[,"([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["[34689]"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ,[,"(7\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["7"]
-,"8 ($1)","",1]
+,"8 ($1)",,1]
 ]
 ,[,,"NA","NA"]
 ,1,,[,,"NA","NA"]
@@ -3970,11 +3970,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"RW",250,"00","0",,,"0",,,,[[,"(2\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["2"]
-,"$1","",0]
+,"$1"]
 ,[,"([7-9]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[7-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -3990,17 +3990,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SA",966,"00","0",,,"0",,,,[[,"([1-467])(\\d{3})(\\d{4})","$1 $2 $3",["[1-467]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1[1-467]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(5\\d)(\\d{3})(\\d{4})","$1 $2 $3",["5"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(92\\d{2})(\\d{5})","$1 $2",["92"]
-,"$1","",0]
+,"$1"]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"$1","",0]
+,"$1"]
 ,[,"(811)(\\d{3})(\\d{3,4})","$1 $2 $3",["81"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4016,7 +4016,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5[12]\\d{3}","\\d{5}"]
 ,"SB",677,"0[01]",,,,,,,,[[,"(\\d{2})(\\d{5})","$1 $2",["[7-9]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4032,9 +4032,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"64\\d{5}","\\d{7}"]
 ,"SC",248,"0[0-2]",,,,,,"00",,[[,"(\\d{3})(\\d{3})","$1 $2",["8"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[246]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4049,7 +4049,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SD",249,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",,"0$1","",0]
+,"SD",249,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4065,25 +4065,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"75[1-8]\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"SE",46,"00","0",,,"0",,,,[[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1-$2 $3 $4",["8"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-69]\\d)(\\d{2,3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-69]\\d)(\\d{3})(\\d{2})","$1-$2 $3",["1[13689]|2[136]|3[1356]|4[0246]|54|6[03]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1-$2 $3 $4",["1[2457]|2[2457-9]|3[0247-9]|4[1357-9]|5[0-35-9]|6[124-9]|9(?:[125-8]|3[0-5]|4[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{2,3})(\\d{2})","$1-$2 $3",["1[2457]|2[2457-9]|3[0247-9]|4[1357-9]|5[0-35-9]|6[124-9]|9(?:[125-8]|3[0-5]|4[0-3])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d)(\\d{3})(\\d{2})(\\d{2})","$1-$2 $3 $4",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(77)(\\d{2})(\\d{2})","$1-$2$3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(20)(\\d{2,3})(\\d{2})","$1-$2 $3",["20"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9[034]\\d)(\\d{2})(\\d{2})(\\d{3})","$1-$2 $3 $4",["9[034]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(9[034]\\d)(\\d{4})","$1-$2",["9[034]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,[[,"(8)(\\d{2,3})(\\d{2,3})(\\d{2})","$1 $2 $3 $4",["8"]
 ]
@@ -4120,13 +4120,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3[12]\\d{6}","\\d{8}"]
 ,"SG",65,"0[0-3]\\d",,,,,,,,[[,"([3689]\\d{3})(\\d{4})","$1 $2",["[369]|8[1-9]"]
-,"","",0]
+]
 ,[,"(1[89]00)(\\d{3})(\\d{4})","$1 $2 $3",["1[89]"]
-,"","",0]
+]
 ,[,"(7000)(\\d{4})(\\d{3})","$1 $2 $3",["70"]
-,"","",0]
+]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4155,13 +4155,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"(?:59|8[1-3])\\d{6}","\\d{8}"]
 ,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[2-8]|7[3-8]"]
-,"(0$1)","",0]
+,"(0$1)"]
 ,[,"([3-7]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[37][01]|4[0139]|51|6"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89][09])(\\d{3,6})","$1 $2",["[89][09]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([58]\\d{2})(\\d{5})","$1 $2",["59|8[1-3]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4190,11 +4190,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"6(?:5[0-4]|9[0-6])\\d{6}","\\d{9}"]
 ,"SK",421,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{3})(\\d{2})","$1/$2 $3 $4",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-5]\\d)(\\d{3})(\\d{2})(\\d{2})","$1/$2 $3 $4",["[3-5]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([689]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[689]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"(?:8(?:00|[5-9]\\d)|9(?:00|[78]\\d))\\d{6}","\\d{9}"]
@@ -4209,7 +4209,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SL",232,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"(0$1)","",0]
+,"SL",232,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",,"(0$1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4225,14 +4225,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5[158]\\d{6}","\\d{8}"]
 ,"SM",378,"00",,,,"(?:0549)?([89]\\d{5})","0549$1",,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]
-,"","",0]
+]
 ,[,"(0549)(\\d{6})","$1 $2",["0"]
-,"","",0]
+]
 ,[,"(\\d{6})","0549 $1",["[89]"]
-,"","",0]
+]
 ]
 ,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]
-,"","",0]
+]
 ,[,"(0549)(\\d{6})","($1) $2",["0"]
 ]
 ,[,"(\\d{6})","(0549) $1",["[89]"]
@@ -4252,9 +4252,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"3392\\d{5}|93330\\d{4}","\\d{9}"]
 ,"SN",221,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[379]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4270,13 +4270,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SO",252,"00","0",,,"0",,,,[[,"(\\d)(\\d{6})","$1 $2",["2[0-79]|[13-5]"]
-,"","",0]
+]
 ,[,"(\\d)(\\d{7})","$1 $2",["24|[67]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{5,7})","$1 $2",["15|28|6[1-35-9]|799|9[2-9]"]
-,"","",0]
+]
 ,[,"(90\\d)(\\d{3})(\\d{3})","$1 $2 $3",["90"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4292,11 +4292,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5(?:6\\d{4}|90[0-4]\\d{3})","\\d{6,7}"]
 ,"SR",597,"00",,,,,,,,[[,"(\\d{3})(\\d{3})","$1-$2",["[2-4]|5[2-58]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1-$2-$3",["56"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1-$2",["59|[6-8]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4311,7 +4311,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"0$1","",0]
+,"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4326,7 +4326,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",,"","",0]
+,"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4342,11 +4342,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SV",503,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[267]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["[89]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["[89]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4375,9 +4375,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SY",963,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-5]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(9\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"]
-,"0$1","",1]
+,"0$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4393,7 +4393,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SZ",268,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[027]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"0800\\d{4}","\\d{8}"]
@@ -4434,7 +4434,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TD",235,"00|16",,,,,,"00",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"TD",235,"00|16",,,,,,"00",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4449,7 +4449,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TG",228,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"","",0]
+,"TG",228,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4465,11 +4465,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"6[08]\\d{7}","\\d{9}"]
 ,"TH",66,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([13-9]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["14|[3-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
-,"$1","",0]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"1\\d{3}","\\d{4}"]
@@ -4485,13 +4485,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TJ",992,"810","8",,,"8",,"8~10",,[[,"([349]\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["[34]7|91[78]"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"([459]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["4[48]|5|9(?:1[59]|[0235-9])"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"(331700)(\\d)(\\d{2})","$1 $2 $3",["331","3317","33170","331700"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ,[,"(\\d{4})(\\d)(\\d{4})","$1 $2 $3",["3[1-5]","3(?:[1245]|3(?:[02-9]|1[0-589]))"]
-,"(8) $1","",1]
+,"(8) $1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4520,9 +4520,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"70\\d{5}","\\d{7}"]
 ,[,,"NA","NA"]
 ,"TL",670,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-489]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})","$1 $2",["7"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4538,11 +4538,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TM",993,"810","8",,,"8",,"8~10",,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["12"]
-,"(8 $1)","",0]
+,"(8 $1)"]
 ,[,"(\\d{2})(\\d{6})","$1 $2",["6"]
-,"8 $1","",0]
+,"8 $1"]
 ,[,"(\\d{3})(\\d)(\\d{2})(\\d{2})","$1 $2-$3-$4",["13|[2-5]"]
-,"(8 $1)","",0]
+,"(8 $1)"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4557,7 +4557,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"8[12]10\\d{4}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"TN",216,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"TN",216,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4573,11 +4573,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TO",676,"00",,,,,,,,[[,"(\\d{2})(\\d{3})","$1-$2",["[1-6]|7[0-4]|8[05]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["7[5-9]|8[47-9]"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{3})","$1 $2",["0"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4593,11 +4593,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"TR",90,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[23]|4(?:[0-35-9]|4[0-35-9])"]
-,"(0$1)","",1]
+,"(0$1)",,1]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[589]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(444)(\\d{1})(\\d{3})","$1 $2 $3",["444"]
-,"","",0]
+]
 ]
 ,,[,,"512\\d{7}","\\d{10}"]
 ,,,[,,"444\\d{4}","\\d{7}"]
@@ -4639,11 +4639,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"70\\d{8}","\\d{10}"]
 ,"TW",886,"0(?:0[25679]|19)","0","#",,"0",,,,[[,"([2-8])(\\d{3,4})(\\d{4})","$1 $2 $3",["[2-6]|[78][1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["80|9"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(70)(\\d{4})(\\d{4})","$1 $2 $3",["70"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4659,11 +4659,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"41\\d{7}","\\d{9}"]
 ,"TZ",255,"00[056]","0",,,"0",,,,[[,"([24]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[24]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([67]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[67]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([89]\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["[89]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4679,11 +4679,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"89\\d{7}","\\d{9}"]
 ,"UA",380,"00","0",,,"0",,"0~0",,[[,"([3-9]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[38]9|4(?:[45][0-5]|87)|5(?:0|6[37]|7[37])|6[36-8]|73|9[1-9]","[38]9|4(?:[45][0-5]|87)|5(?:0|6(?:3[14-7]|7)|7[37])|6[36-8]|73|9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-689]\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3[1-8]2|4[13678]2|5(?:[12457]2|6[24])|6(?:[49]2|[12][29]|5[24])|8[0-8]|90","3(?:[1-46-8]2[013-9]|52)|4(?:[1378]2|62[013-9])|5(?:[12457]2|6[24])|6(?:[49]2|[12][29]|5[24])|8[0-8]|90"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([3-6]\\d{3})(\\d{5})","$1 $2",["3(?:5[013-9]|[1-46-8])|4(?:[137][013-9]|6|[45][6-9]|8[4-6])|5(?:[1245][013-9]|6[0135-9]|3|7[4-6])|6(?:[49][013-9]|5[0135-9]|[12][13-8])","3(?:5[013-9]|[1-46-8](?:22|[013-9]))|4(?:[137][013-9]|6(?:[013-9]|22)|[45][6-9]|8[4-6])|5(?:[1245][013-9]|6(?:3[02389]|[015689])|3|7[4-6])|6(?:[49][013-9]|5[0135-9]|[12][13-8])"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4699,11 +4699,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"UG",256,"00[057]","0",,,"0",,,,[[,"(\\d{3})(\\d{6})","$1 $2",["[7-9]|20(?:[013-8]|2[5-9])|4(?:6[45]|[7-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{7})","$1 $2",["3|4(?:[1-5]|6[0-36-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(2024)(\\d{5})","$1 $2",["2024"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4718,8 +4718,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"5(?:00|33|44|66|77)[2-9]\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
-,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",,"","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3",,"","",1]
+,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3"]
 ]
 ,[[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3"]
 ]
@@ -4737,11 +4737,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"UY",598,"0(?:1[3-9]\\d|0)","0"," int. ",,"0",,"00",,[[,"(\\d{4})(\\d{4})","$1 $2",["[24]"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9[1-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{4})","$1 $2",["[89]0"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4756,7 +4756,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"UZ",998,"810","8",,,"8",,"8~10",,[[,"([679]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"8 $1","",0]
+,"UZ",998,"810","8",,,"8",,"8~10",,[[,"([679]\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"8 $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4797,7 +4797,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"VE",58,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{7})","$1-$2",,"0$1","$CC $1",0]
+,"VE",58,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{7})","$1-$2",,"0$1","$CC $1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4839,23 +4839,23 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"VN",84,"00","0",,,"0",,,,[[,"([17]99)(\\d{4})","$1 $2",["[17]99"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([48])(\\d{4})(\\d{4})","$1 $2 $3",["[48]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([235-7]\\d)(\\d{4})(\\d{3})","$1 $2 $3",["2[025-79]|3[0136-9]|5[2-9]|6[0-46-8]|7[02-79]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(80)(\\d{5})","$1 $2",["80"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(69\\d)(\\d{4,5})","$1 $2",["69"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"([235-7]\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["2[1348]|3[25]|5[01]|65|7[18]"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(9\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["9"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1[2689]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["1(?:[26]|8[68]|99)"]
-,"0$1","",1]
+,"0$1",,1]
 ,[,"(1[89]00)(\\d{4,6})","$1 $2",["1[89]0"]
-,"$1","",1]
+,"$1",,1]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"[17]99\\d{4}|69\\d{5,6}","\\d{7,8}"]
@@ -4871,7 +4871,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"VU",678,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[579]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4886,7 +4886,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"WF",681,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
+,"WF",681,"00",,,,,,,1,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4902,11 +4902,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"WS",685,"0",,,,,,,,[[,"(8\\d{2})(\\d{3,4})","$1 $2",["8"]
-,"","",0]
+]
 ,[,"(7\\d)(\\d{5})","$1 $2",["7"]
-,"","",0]
+]
 ,[,"(\\d{5})","$1",["[2-6]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4922,9 +4922,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"YE",967,"00","0",,,"0",,,,[[,"([1-7])(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-6]|7[24-68]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["7[0137]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4953,13 +4953,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"87\\d{7}","\\d{9}"]
 ,"ZA",27,"00","0",,,"0",,,,[[,"(860)(\\d{3})(\\d{3})","$1 $2 $3",["860"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[1-79]|8(?:[0-47]|6[1-9])"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3,4})","$1 $2",["8[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["8[1-4]"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4975,9 +4975,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"ZM",260,"00","0",,,"0",,,,[[,"([29]\\d)(\\d{7})","$1 $2",["[29]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(800)(\\d{3})(\\d{3})","$1 $2 $3",["8"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4993,25 +4993,25 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"86(?:1[12]|30|44|55|77|8[367]|99)\\d{6}","\\d{10}"]
 ,"ZW",263,"00","0",,,"0",,,,[[,"([49])(\\d{3})(\\d{2,4})","$1 $2 $3",["4|9[2-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(7\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["7"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(86\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["86[24]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([2356]\\d{2})(\\d{3,5})","$1 $2",["2(?:0[45]|2[278]|[49]8|[78])|3(?:08|17|3[78]|7[1569]|8[37]|98)|5[15][78]|6(?:[29]8|[38]7|6[78]|75|[89]8)"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:1[39]|2[0157]|6[14]|7[35]|84)|329"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([1-356]\\d)(\\d{3,5})","$1 $2",["1[3-9]|2[0569]|3[0-69]|5[05689]|6[0-46-9]"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([235]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[23]9|54"]
-,"0$1","",0]
+,"0$1"]
 ,[,"([25]\\d{3})(\\d{3,5})","$1 $2",["(?:25|54)8","258[23]|5483"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(8\\d{3})(\\d{6})","$1 $2",["86"]
-,"0$1","",0]
+,"0$1"]
 ,[,"(80\\d)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5026,7 +5026,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",800,"",,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5041,7 +5041,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"\\d{8}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",808,"",,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",,"","",0]
+,"001",808,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5056,7 +5056,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",870,"",,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",,"","",0]
+,"001",870,,,,,,,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5071,7 +5071,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"10\\d{10}","\\d{12}"]
-,"001",878,"",,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3",,"","",0]
+,"001",878,,,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5086,8 +5086,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",881,"",,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
-,"","",0]
+,"001",881,,,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5102,20 +5102,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15678]|9[0689])\\d{4}|6\\d{5,10})|345\\d{7}","\\d{7,12}"]
-,"001",882,"",,,,,,,,[[,"(\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["3[23]"]
-,"","",0]
+,"001",882,,,,,,,,,[[,"(\\d{2})(\\d{4})(\\d{3})","$1 $2 $3",["3[23]"]
+]
 ,[,"(\\d{2})(\\d{5})","$1 $2",["16|342"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["34[57]"]
-,"","",0]
+]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["348"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["1"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["16"]
-,"","",0]
+]
 ,[,"(\\d{2})(\\d{4,5})(\\d{5})","$1 $2 $3",["16"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5130,12 +5130,12 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"51(?:00\\d{5}(?:\\d{3})?|[13]0\\d{8})","\\d{9}(?:\\d{3})?"]
-,"001",883,"",,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["510"]
-,"","",0]
+,"001",883,,,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["510"]
+]
 ,[,"(\\d{3})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["510"]
-,"","",0]
+]
 ,[,"(\\d{4})(\\d{4})(\\d{4})","$1 $2 $3",["51[13]"]
-,"","",0]
+]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5150,7 +5150,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",888,"",,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{5})","$1 $2 $3",,"","",0]
+,"001",888,,,,,,,,1,[[,"(\\d{3})(\\d{3})(\\d{5})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -5165,7 +5165,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"001",979,"",,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",,"","",0]
+,"001",979,,,,,,,,1,[[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
index fc40b63f7..0ec867059 100644
Binary files a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ
diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
index 961e57452..d04d5f12a 100644
Binary files a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ