Updates #23011

Change-Id: I38360501c772ddf7cc4bd1b5d7b0225387ead535
Reviewed-on: https://go-review.googlesource.com/c/151361Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>