A+C: Andrew Szeto (individual CLA) Generated by addca. R=gobot CC=golang-codereviews https://golang.org/cl/86960046