Updates #18008

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