diff --git a/java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
index 2720deb7e..6fa912455 100644
--- a/java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
+++ b/java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
@@ -68,7 +68,7 @@ public class BuildMetadataProtoFromXml {
     String outputDir = args[1];
     boolean forTesting = args[2].equals("true");
     boolean liteBuild = args.length > 3 && args[3].equals("true");
-    
+
     String filePrefix;
     if (forTesting) {
       filePrefix = outputDir + PhoneNumberUtilTest.TEST_META_DATA_FILE_PREFIX;
@@ -110,6 +110,9 @@ public class BuildMetadataProtoFromXml {
       " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
       " * See the License for the specific language governing permissions and\n" +
       " * limitations under the License.\n" +
+      " *\n" +
+      " * This file is automatically generated by BuildMetadataProtoFromXml. Please\n" +
+      " * don't modify directly.\n" +
       " */\n\n";
   private static final String MAPPING_IMPORTS =
       "import java.util.ArrayList;\n" +
diff --git a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index ea79e9e79..b0e500de8 100644
--- a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -323,9 +323,9 @@ public class AsYouTypeFormatter {
     if (!ableToFormat) {
       return originalPosition;
     }
-    int accruedInputIndex = 0, currentOutputIndex = 0;
+    int accruedInputIndex = 0;
+    int currentOutputIndex = 0;
     int currentOutputLength = currentOutput.length();
-    
     while (accruedInputIndex < positionToRemember && currentOutputIndex < currentOutputLength) {
       if (accruedInputWithoutFormatting.charAt(accruedInputIndex) ==
           currentOutput.charAt(currentOutputIndex)) {
diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index b26cf02a1..86e7f0b17 100644
--- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -12,6 +12,9 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * This file is automatically generated by BuildMetadataProtoFromXml. Please
+ * don't modify directly.
  */
 
 package com.google.i18n.phonenumbers;
diff --git a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
index 42e2a6f1a..45ef033ea 100644
--- a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
+++ b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
@@ -12,6 +12,9 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * This file is automatically generated by BuildMetadataProtoFromXml. Please
+ * don't modify directly.
  */
 
 package com.google.i18n.phonenumbers;