Change-Id: I19f7c181d9bd8148f7791925f04207a34c95ac1e Reviewed-on: https://go-review.googlesource.com/18484 Reviewed-by: Andrew Gerrand <adg@golang.org>