Updates #20587

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