diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 8f81775..a68c38b 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -2700,8 +2700,8 @@
 [source, java]
 ----
 import java.util.Optional;
-import com.google.gerrit.common.data.SubmitRecord;
-import com.google.gerrit.common.data.SubmitRecord.Status;
+import com.google.gerrit.entities.SubmitRecord;
+import com.google.gerrit.entities.SubmitRecord.Status;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.server.rules.SubmitRule;
 
diff --git a/plugins/replication b/plugins/replication
index 13f8bb9..2b6d691 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 13f8bb9895c6f7b6ce675bd78835ac7007416d99
+Subproject commit 2b6d691d5fb6f918cd15dbff2432e228e457aa0f