For golang/go#64973

Change-Id: I5b15535ce2ce7f6edefb85c9da66fc4df0e24775
Reviewed-on: https://go-review.googlesource.com/c/tools/+/565715
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Robert Findley <rfindley@google.com>
Reviewed-by: Alan Donovan <adonovan@google.com>