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