Updates #20587

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