Updates #20162

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