Updates #18294.

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