A+C: Jay Weisskopf (individual CLA) Generated by addca. R=gobot CC=golang-codereviews https://golang.org/cl/67010044