Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/194698

From-SVN: r275691