Fixes #7858. LGTM=ruiu R=ruiu CC=golang-codereviews https://golang.org/cl/92720045
Attach a file by drag & drop or click to upload
