Updates #11041

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