Fixes #13266. Change-Id: I31da922e0599989e52acf346374c2077b157ebb7 Reviewed-on: https://go-review.googlesource.com/16971 Reviewed-by: Chris Manghane <cmang@golang.org>