Updates #20587

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