Change-Id: I832ba5f32d513b586bb0b02371231786b25631e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/201817Reviewed-by: Andrew Bonventre <andybons@golang.org>
(cherry picked from commit 58e8f789)
Reviewed-on: https://go-review.googlesource.com/c/go/+/201821