Updates #17082.

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