(CL https://golang.org/cl/62540043) TBR=gri R=gri CC=golang-codereviews https://golang.org/cl/65530046