Updates #15810.

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