Updates #18636

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