Updates #20587

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