Follow CL 2810

Change-Id: Ic833681c7abd8973e952aaad40986fd3385c94db
Reviewed-on: https://go-review.googlesource.com/86895
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>