Fixes #15832

Change-Id: I6f3f45e3c21edd0e093ecb1d8a067907863478f5
Reviewed-on: https://go-review.googlesource.com/23441Reviewed-by: Dmitry Vyukov <dvyukov@google.com>