Change-Id: Ied1582d8aabee2eb346e1c23bfd7781e4a091264
Reviewed-on: https://go-review.googlesource.com/8621Reviewed-by: Robert Griesemer <gri@golang.org>