b9702967ee
Reviewed-on: https://go-review.googlesource.com/16527 From-SVN: r229624
Reviewed-on: https://go-review.googlesource.com/16527 From-SVN: r229624