Change-Id: Ib6a0f5c35b1efc3f3c8e7ca2a5c4f35bf8bf5e5d
Reviewed-on: https://go-review.googlesource.com/c/163720Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit 9d26ec85)
Reviewed-on: https://go-review.googlesource.com/c/163721Reviewed-by: Andrew Bonventre <andybons@golang.org>