diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 0f2acf8eae..38d4f46fe7 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -65,6 +65,12 @@ GUID="$(git config user.name) <$(git config user.email)>"
 			'"${SPLICE_CMD}"'
 		}
 		end=1
+	}; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ {
+		if (end==0) {
+			print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
+			print "";
+		}
+		end=1
 	}; {
 		if (end==0)
 			print "Original-" $0;