Fixes #17637.

Change-Id: I5af63b8277c0a0f9fef4880992bcb925ca088687
Reviewed-on: https://go-review.googlesource.com/32106Reviewed-by: Matthew Dempsky <mdempsky@google.com>