Updates #10639

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