Change-Id: I845375d2b3824211b80885228ba5b45503cba1a6
Reviewed-on: https://go-review.googlesource.com/c/163722Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit 8bffb854)
Reviewed-on: https://go-review.googlesource.com/c/163723Reviewed-by: Andrew Bonventre <andybons@golang.org>