Change-Id: I2deb44b5ba64e0838cf15f79aebc911ee38f6954
Reviewed-on: https://go-review.googlesource.com/33797
Run-TryBot: Chris Broadfoot <cbro@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>