Fixes #22176

Change-Id: If47ec9a25da6b480868d8eeccc518dc97d48bda7
Reviewed-on: https://go-review.googlesource.com/69230Reviewed-by: Alex Brainman <alex.brainman@gmail.com>