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