Updates #17929

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