Updates #26937
Updates #17227

Change-Id: I79865938b05c219e1947822e60e4f52bb2604b70
Reviewed-on: https://go-review.googlesource.com/131279Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>