Updates #20784

Change-Id: Ic07c78a86da5026e407ac9ecb3117d320c198048
Reviewed-on: https://go-review.googlesource.com/82016Reviewed-by: Andrew Bonventre <andybons@golang.org>