Updates #20587

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