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/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
index d36273f8b..e5407f8e8 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java
@@ -319,14 +319,12 @@ public class BuildMetadataFromXml {
           format.setNationalPrefixFormattingRule(nationalPrefixFormattingRule);
         }
 
-        if (format.hasNationalPrefixFormattingRule()) {
-          if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) {
-            format.setNationalPrefixOptionalWhenFormatting(
-                Boolean.valueOf(numberFormatElement.getAttribute(
-                    NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)));
-          } else {
-            format.setNationalPrefixOptionalWhenFormatting(nationalPrefixOptionalWhenFormatting);
-          }
+        if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) {
+          format.setNationalPrefixOptionalWhenFormatting(
+              Boolean.valueOf(numberFormatElement.getAttribute(
+                  NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)));
+        } else {
+          format.setNationalPrefixOptionalWhenFormatting(nationalPrefixOptionalWhenFormatting);
         }
         if (numberFormatElement.hasAttribute(CARRIER_CODE_FORMATTING_RULE)) {
           format.setDomesticCarrierCodeFormattingRule(validateRE(
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..bfea10bc0 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..fe2b1ff52 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