A+C: David Calavera (individual CLA) Generated by addca. R=gobot CC=golang-codereviews https://golang.org/cl/90970048