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

From-SVN: r233110