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