Updates #17929

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