diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
index 0e291fab8..5c072d6ab 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
@@ -18,7 +18,6 @@ package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java
index 0c77c89e6..9a0b8e690 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 final class MultiFileMetadataSourceImpl implements MetadataSource {
   // The prefix of the binary files containing phone number metadata for different regions.
   // This enables us to set up with different metadata, such as for testing.
-  private final String multiFilePhoneNumberMetadataFilePrefix;
+  private final String phoneNumberMetadataFilePrefix;
 
   // The {@link MetadataLoader} used to inject alternative metadata sources.
   private final MetadataLoader metadataLoader;
@@ -47,23 +47,22 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
   private final ConcurrentHashMap<Integer, PhoneMetadata> nonGeographicalRegions =
       new ConcurrentHashMap<Integer, PhoneMetadata>();
 
-  // It is assumed that metadataLoader is not null. Checks should happen before passing here.
+  // It is assumed that metadataLoader is not null. Checks should happen before passing it in here.
   // @VisibleForTesting
-  MultiFileMetadataSourceImpl(String multiFilePhoneNumberMetadataFilePrefix,
-      MetadataLoader metadataLoader) {
-    this.multiFilePhoneNumberMetadataFilePrefix = multiFilePhoneNumberMetadataFilePrefix;
+  MultiFileMetadataSourceImpl(String phoneNumberMetadataFilePrefix, MetadataLoader metadataLoader) {
+    this.phoneNumberMetadataFilePrefix = phoneNumberMetadataFilePrefix;
     this.metadataLoader = metadataLoader;
   }
 
-  // It is assumed that metadataLoader is not null. Checks should happen before passing here.
-  public MultiFileMetadataSourceImpl(MetadataLoader metadataLoader) {
+  // It is assumed that metadataLoader is not null. Checks should happen before passing it in here.
+  MultiFileMetadataSourceImpl(MetadataLoader metadataLoader) {
     this(MetadataManager.MULTI_FILE_PHONE_NUMBER_METADATA_FILE_PREFIX, metadataLoader);
   }
 
   @Override
   public PhoneMetadata getMetadataForRegion(String regionCode) {
     return MetadataManager.getMetadataFromMultiFilePrefix(regionCode, geographicalRegions,
-        multiFilePhoneNumberMetadataFilePrefix, metadataLoader);
+        phoneNumberMetadataFilePrefix, metadataLoader);
   }
 
   @Override
@@ -73,7 +72,7 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
       return null;
     }
     return MetadataManager.getMetadataFromMultiFilePrefix(countryCallingCode, nonGeographicalRegions,
-        multiFilePhoneNumberMetadataFilePrefix, metadataLoader);
+        phoneNumberMetadataFilePrefix, metadataLoader);
   }
 
   // A country calling code is non-geographical if it only maps to the non-geographical region code,
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
index 239db3df5..7c9b0fafe 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
@@ -17,7 +17,6 @@
 package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
-import java.util.concurrent.ConcurrentHashMap;
 import junit.framework.TestCase;
 
 /**
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 53539d2a6..b0e1c6884 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