Updates #15810

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