Updates #17929

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