Updates #17824.

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