Updates #20587

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