Fixes: make clean; make test R=gri CC=golang-dev https://golang.org/cl/2234044
Attach a file by drag & drop or click to upload
