Reviewed-on: https://go-review.googlesource.com/16583

From-SVN: r229686