Fixes #20428

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