Updates #12042

Change-Id: Ia8d2214caad50560c4d46d723f8b94c954059b98
Reviewed-on: https://go-review.googlesource.com/128877


Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>