Fixes #7496. LGTM=jsing R=golang-codereviews, jsing CC=golang-codereviews https://golang.org/cl/72840043
Attach a file by drag & drop or click to upload
