Change-Id: I4a64493f521678570a89d5da76604c258fb9ceac Reviewed-on: https://go-review.googlesource.com/1631 Reviewed-by: Andrew Gerrand <adg@golang.org>