Updates #31293

Change-Id: I3d72f732be7b28059310ea6fc134c3bfac81492d
Reviewed-on: https://go-review.googlesource.com/c/go/+/171578Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
(cherry picked from commit ab2a0803)
Reviewed-on: https://go-review.googlesource.com/c/go/+/171766Reviewed-by: Bryan C. Mills <bcmills@google.com>