Updates golang/go#18152

Change-Id: Ia3df3f9668847690e60a2af0680cf1bd66042384
Reviewed-on: https://go-review.googlesource.com/33806Reviewed-by: Ross Light <light@google.com>