diff --git a/protobuf-sdk/src/main/java/com/google/protobuf/AbstractMessage.java b/protobuf-api/src/main/java/com/google/protobuf/AbstractMessage.java
similarity index 99%
rename from protobuf-sdk/src/main/java/com/google/protobuf/AbstractMessage.java
rename to protobuf-api/src/main/java/com/google/protobuf/AbstractMessage.java
index 9c6e207..7b94d47 100644
--- a/protobuf-sdk/src/main/java/com/google/protobuf/AbstractMessage.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/AbstractMessage.java
@@ -84,7 +84,7 @@ public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
 
   @Override
   public final String toString() {
-    return TextFormat.printer().printToString(this);
+    return TextFormatInternal.printer().printToString(this);
   }
 
   @Override
@@ -437,7 +437,7 @@ public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int
 
     @Override
     public String toString() {
-      return TextFormat.printer().printToString(this);
+      return TextFormatInternal.printer().printToString(this);
     }
 
     /** Construct an UninitializedMessageException reporting missing fields in the given message. */
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Any.java b/protobuf-api/src/main/java/com/google/protobuf/Any.java
index d950290..795124c 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Any.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Any.java
@@ -504,7 +504,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -622,7 +622,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Api.java b/protobuf-api/src/main/java/com/google/protobuf/Api.java
index a04ebcc..2b9c3e2 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Api.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Api.java
@@ -667,7 +667,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -709,7 +709,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/BoolValue.java b/protobuf-api/src/main/java/com/google/protobuf/BoolValue.java
index c3b51ee..e9de0ff 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/BoolValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/BoolValue.java
@@ -214,7 +214,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -250,7 +250,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/BytesValue.java b/protobuf-api/src/main/java/com/google/protobuf/BytesValue.java
index 8b70f3e..bafc0e8 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/BytesValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/BytesValue.java
@@ -214,7 +214,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -250,7 +250,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/DescriptorProtos.java b/protobuf-api/src/main/java/com/google/protobuf/DescriptorProtos.java
index 8c8fa7e..d490185 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/DescriptorProtos.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/DescriptorProtos.java
@@ -556,7 +556,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -592,7 +592,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -2578,7 +2578,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2612,7 +2612,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -6064,7 +6064,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -6094,7 +6094,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
@@ -6892,7 +6892,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -6928,7 +6928,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -8004,7 +8004,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8038,7 +8038,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -11676,7 +11676,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -11706,7 +11706,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -12800,7 +12800,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -12831,7 +12831,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -15742,7 +15742,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -15776,7 +15776,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -17511,7 +17511,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -17545,7 +17545,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -18506,7 +18506,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -18545,7 +18545,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -19351,7 +19351,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -19385,7 +19385,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -21091,7 +21091,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -21125,7 +21125,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -22037,7 +22037,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -22071,7 +22071,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -23470,7 +23470,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -23504,7 +23504,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -26700,7 +26700,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -26731,7 +26731,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -30541,7 +30541,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -30572,7 +30572,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -33268,7 +33268,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -33298,7 +33298,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -34175,7 +34175,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -34209,7 +34209,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -35716,7 +35716,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -35747,7 +35747,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -38391,7 +38391,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -38422,7 +38422,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -39900,7 +39900,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -39931,7 +39931,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -41654,7 +41654,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -41685,7 +41685,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -43342,7 +43342,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -43373,7 +43373,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -44946,7 +44946,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -44977,7 +44977,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -46435,7 +46435,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -46473,7 +46473,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -47312,7 +47312,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -47351,7 +47351,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -49396,7 +49396,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -49436,7 +49436,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -50557,7 +50557,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -50594,7 +50594,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
@@ -51513,7 +51513,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -51550,7 +51550,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -53596,7 +53596,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -53626,7 +53626,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -55351,7 +55351,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -55387,7 +55387,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -57542,7 +57542,7 @@ public Builder toBuilder() {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -57572,7 +57572,7 @@ private Builder() {
         }
 
         private Builder(
-            com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.AbstractMessage.BuilderParent parent) {
           super(parent);
 
         }
@@ -58470,7 +58470,7 @@ public Builder toBuilder() {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -58506,7 +58506,7 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.AbstractMessage.BuilderParent parent) {
         super(parent);
 
       }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/DoubleValue.java b/protobuf-api/src/main/java/com/google/protobuf/DoubleValue.java
index 9a0b11f..9ba2244 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/DoubleValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/DoubleValue.java
@@ -215,7 +215,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -251,7 +251,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Duration.java b/protobuf-api/src/main/java/com/google/protobuf/Duration.java
index 361ee3d..70a45a1 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Duration.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Duration.java
@@ -302,7 +302,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -393,7 +393,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Empty.java b/protobuf-api/src/main/java/com/google/protobuf/Empty.java
index 38426dc..41ce217 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Empty.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Empty.java
@@ -191,7 +191,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -231,7 +231,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Enum.java b/protobuf-api/src/main/java/com/google/protobuf/Enum.java
index f65cd39..7b4a558 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Enum.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Enum.java
@@ -543,7 +543,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -577,7 +577,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/EnumValue.java b/protobuf-api/src/main/java/com/google/protobuf/EnumValue.java
index 93c173b..5775d6a 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/EnumValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/EnumValue.java
@@ -344,7 +344,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -378,7 +378,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Field.java b/protobuf-api/src/main/java/com/google/protobuf/Field.java
index 3228d6e..078cce8 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Field.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Field.java
@@ -1227,7 +1227,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -1261,7 +1261,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/FieldMask.java b/protobuf-api/src/main/java/com/google/protobuf/FieldMask.java
index c5fa321..10ac0b4 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/FieldMask.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/FieldMask.java
@@ -455,7 +455,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -687,7 +687,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java b/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
index d51c6c6..da1c17f 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
@@ -47,7 +47,7 @@
  *
  * @author kenton@google.com Kenton Varda
  */
-abstract class FlattenedGeneratedMessageV3 implements Message, Serializable {
+abstract class FlattenedGeneratedMessageV3 extends AbstractMessage implements Message, Serializable {
   private static final long serialVersionUID = 1L;
 
   /**
@@ -795,7 +795,7 @@ protected void makeExtensionsImmutable() {
   }
 
   /** TODO: remove this together with GeneratedMessageV3.BuilderParent. */
-  protected abstract Message.Builder newBuilderForType(BuilderParent parent);
+//  protected abstract Message.Builder newBuilderForType(BuilderParent parent);
 
   /** TODO: generated class should implement this directly */
   protected Message.Builder newBuilderForType(final Message.BuilderParent parent) {
@@ -811,9 +811,9 @@ public void markDirty() {
   /** Builder class for {@link FlattenedGeneratedMessageV3}. */
   @SuppressWarnings("unchecked")
   public abstract static class Builder<BuilderT extends Builder<BuilderT>>
-      implements Message.Builder {
+          extends AbstractMessage.Builder<BuilderT> {
 
-    private BuilderParent builderParent;
+    private AbstractMessage.BuilderParent builderParent;
 
     private BuilderParentImpl meAsParent;
 
@@ -838,7 +838,7 @@ protected Builder() {
       this(null);
     }
 
-    protected Builder(BuilderParent builderParent) {
+    protected Builder(AbstractMessage.BuilderParent builderParent) {
       this.builderParent = builderParent;
     }
 
@@ -2351,7 +2351,7 @@ public abstract static class ExtendableBuilder<
 
     protected ExtendableBuilder() {}
 
-    protected ExtendableBuilder(BuilderParent parent) {
+    protected ExtendableBuilder(AbstractMessage.BuilderParent parent) {
       super(parent);
     }
 
diff --git a/protobuf-api/src/main/java/com/google/protobuf/FloatValue.java b/protobuf-api/src/main/java/com/google/protobuf/FloatValue.java
index 07dc2da..7c1addf 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/FloatValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/FloatValue.java
@@ -215,7 +215,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -251,7 +251,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Int32Value.java b/protobuf-api/src/main/java/com/google/protobuf/Int32Value.java
index b6ca2bb..d329b55 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Int32Value.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Int32Value.java
@@ -213,7 +213,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -249,7 +249,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Int64Value.java b/protobuf-api/src/main/java/com/google/protobuf/Int64Value.java
index 250d70d..c6dd1e9 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Int64Value.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Int64Value.java
@@ -214,7 +214,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -250,7 +250,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/ListValue.java b/protobuf-api/src/main/java/com/google/protobuf/ListValue.java
index 05fbedc..31efb92 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/ListValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/ListValue.java
@@ -262,7 +262,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -298,7 +298,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Method.java b/protobuf-api/src/main/java/com/google/protobuf/Method.java
index 208b8b9..62f1191 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Method.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Method.java
@@ -525,7 +525,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -559,7 +559,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Mixin.java b/protobuf-api/src/main/java/com/google/protobuf/Mixin.java
index 3731fe4..fdb76d0 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Mixin.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Mixin.java
@@ -380,7 +380,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -491,7 +491,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Option.java b/protobuf-api/src/main/java/com/google/protobuf/Option.java
index dac0036..1352ce0 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Option.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Option.java
@@ -314,7 +314,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -349,7 +349,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/SourceContext.java b/protobuf-api/src/main/java/com/google/protobuf/SourceContext.java
index 059b3ec..fe8b562 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/SourceContext.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/SourceContext.java
@@ -246,7 +246,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -281,7 +281,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/StringValue.java b/protobuf-api/src/main/java/com/google/protobuf/StringValue.java
index 7943deb..ebac935 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/StringValue.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/StringValue.java
@@ -245,7 +245,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -281,7 +281,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Struct.java b/protobuf-api/src/main/java/com/google/protobuf/Struct.java
index 9ec8a2a..5ad130d 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Struct.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Struct.java
@@ -321,7 +321,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -384,7 +384,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Timestamp.java b/protobuf-api/src/main/java/com/google/protobuf/Timestamp.java
index b7eb723..11cc455 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Timestamp.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Timestamp.java
@@ -331,7 +331,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -453,7 +453,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Type.java b/protobuf-api/src/main/java/com/google/protobuf/Type.java
index 0b7261f..b460e64 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Type.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Type.java
@@ -615,7 +615,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -649,7 +649,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/UInt32Value.java b/protobuf-api/src/main/java/com/google/protobuf/UInt32Value.java
index 885b63d..d88c3e4 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/UInt32Value.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/UInt32Value.java
@@ -213,7 +213,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -249,7 +249,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/UInt64Value.java b/protobuf-api/src/main/java/com/google/protobuf/UInt64Value.java
index b0db2f5..03e0d58 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/UInt64Value.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/UInt64Value.java
@@ -214,7 +214,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -250,7 +250,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }
diff --git a/protobuf-api/src/main/java/com/google/protobuf/Value.java b/protobuf-api/src/main/java/com/google/protobuf/Value.java
index e59e991..90649d6 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/Value.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/Value.java
@@ -596,7 +596,7 @@ public Builder toBuilder() {
 
   @java.lang.Override
   protected Builder newBuilderForType(
-      com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+      com.google.protobuf.AbstractMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -635,7 +635,7 @@ private Builder() {
     }
 
     private Builder(
-        com.google.protobuf.FlattenedGeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.AbstractMessage.BuilderParent parent) {
       super(parent);
 
     }