Updates #20587

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