Updates #27302
Updates #22907

Change-Id: Iac6957f3517265dfb9c662efb7af31192e3bfd6c
Reviewed-on: https://go-review.googlesource.com/c/162960Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit ef454fd5)
Reviewed-on: https://go-review.googlesource.com/c/162826