Fixes #21798

Change-Id: Ided31a8b22c220acdeb3938cac41ce8db9a110c3
Reviewed-on: https://go-review.googlesource.com/62290Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>