Updates #20587

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