Tags: fixed-upstream
Forwarded: https://github.com/golang/go/issues/20007

Hello,

This patch fixes the test failure in core-updates. I've tried to
cherry-pick upstream's commit, but it doesn't work. So I fall back to
fix it directly instead. The bug has already been fixed upstream, and
the fix will be in the next release (1.9). See [0] for details.