Updates #25849

Change-Id: I09ee928b462ab538a9d38c4e317eaeb8856919f2
Reviewed-on: https://go-review.googlesource.com/118335Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>