Updates golang/go#16218

Change-Id: Ice2821e873807ac4222825f0ca6f47b6a53f90b9
Reviewed-on: https://go-review.googlesource.com/46630Reviewed-by: Mikio Hara <mikioh.mikioh@gmail.com>