Updates #15735

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