Update #17617.

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