Updates #16625

Change-Id: Icac6705828bd9b29379596ba64b34d922b9002c3
Reviewed-on: https://go-review.googlesource.com/25548Reviewed-by: Ian Lance Taylor <iant@golang.org>