Submitting as a TBR to fix the build. R=dho, rsc https://golang.org/cl/164078
Attach a file by drag & drop or click to upload
