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