Updates #23011

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