Updates #5282 R=golang-dev, r CC=golang-dev https://golang.org/cl/8718045
Attach a file by drag & drop or click to upload