Fixes #23748

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