Update #4866. R=golang-dev, dave CC=golang-dev https://golang.org/cl/7398047
Attach a file by drag & drop or click to upload
