Updates #20587

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