Fixes #18231.

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