For #23011.
For #27619.

Change-Id: Id1f280993ecdfb07a7420926ca1c0f5b7872afbb
Reviewed-on: https://go-review.googlesource.com/c/go/+/174521Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>