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