Fixes #8904. TBR=iant R=iant CC=golang-codereviews https://golang.org/cl/148650043
Attach a file by drag & drop or click to upload
