(addressing comments from 1741045) R=r CC=golang-dev https://golang.org/cl/1678047
Attach a file by drag & drop or click to upload
