Fixes #15291.

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