A+C: Erik Westrup (individual CLA) Generated by addca. R=gobot CC=golang-codereviews https://golang.org/cl/80920048