Update #22906
Update #21897

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