Updates #24331

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