Change-Id: Ie24d56422ae2196198a6c306716fa867c1442d6e Reviewed-on: https://go-review.googlesource.com/17043 Reviewed-by: Chris Manghane <cmang@golang.org>