Change-Id: Icca4495f727e3921b717a4bbb441cd832d321d46
Reviewed-on: https://go-review.googlesource.com/c/go/+/175439Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit e1f9e701)
Reviewed-on: https://go-review.googlesource.com/c/go/+/175443Reviewed-by: Andrew Bonventre <andybons@golang.org>