diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index c640e33f65..7442b9ba15 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -50,19 +50,22 @@ GUID="$(git config user.name) <$(git config user.email)>"
 
 (printf "${MESSAGE_PREFIX}"; commit_message) | tac | awk '/^$/ {
 		if (end==0) {
-			print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
+			print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
 			'"${SPLICE_CMD}"'
 		}
 		end=1
 	}; /^(BUG|BRANCH|TEST)=/ {
 		if (end==0) {
-			print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
+			print "GitOrigin-RevId: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
 			print "";
 		}
 		end=1
 	}; /^Cq-Depend:/ {
 		print $0;
 		next
+	}; /^Change-Id:/ {
+		print $0;
+		next
 	}; {
 		if (end==0)
 			print "Original-" $0;