diff --git a/autoroll/go/commit_msg/android.go b/autoroll/go/commit_msg/android.go
index f73120d..deeac2d 100644
--- a/autoroll/go/commit_msg/android.go
+++ b/autoroll/go/commit_msg/android.go
@@ -24,7 +24,11 @@
 {{- end -}}
 {{- if .IncludeTests -}}
 {{ range .Tests }}Test: {{ . }}
-{{- end}}
+{{ end -}}
+{{- end -}}
+{{ if .ExtraFooters -}}
+{{ range .ExtraFooters }}{{.}}
+{{ end -}}
 {{- end -}}
 {{- end -}}`))
 )
diff --git a/autoroll/go/commit_msg/android_test.go b/autoroll/go/commit_msg/android_test.go
index 8092e90..2bff8e2 100644
--- a/autoroll/go/commit_msg/android_test.go
+++ b/autoroll/go/commit_msg/android_test.go
@@ -46,6 +46,8 @@
 Bug: fakebugproject:1234
 Bug: fakebugproject:5678
 Test: some-test
+My-Footer: BlahBlah
+My-Other-Footer: Blah
 `, result)
 }
 
@@ -85,6 +87,8 @@
 Bug: fakebugproject:1234
 Bug: fakebugproject:5678
 Test: some-test
+My-Footer: BlahBlah
+My-Other-Footer: Blah
 `, result)
 }
 
@@ -125,6 +129,8 @@
 Test: Presubmit checks will test this change.
 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
 Test: some-test
+My-Footer: BlahBlah
+My-Other-Footer: Blah
 `, result)
 }
 
@@ -141,6 +147,7 @@
 	b.cfg.IncludeLog = false
 	b.cfg.IncludeTbrLine = false
 	b.cfg.IncludeTests = false
+	b.cfg.ExtraFooters = nil
 	b.transitiveDeps = nil
 	result, err := b.Build(FakeCommitMsgInputs())
 	require.NoError(t, err)