Fixes #18406

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