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