Updates #24715

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