Updates #22927
Updates #20852

Change-Id: I3ac0f8d38375d58a77781ab0e4f78ca57b258de0
Reviewed-on: https://go-review.googlesource.com/80756Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>