Fixes #16099

Change-Id: I334c1f04dfc98c4a07e33745819d890b5fcb1673
Reviewed-on: https://go-review.googlesource.com/24243Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>