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

From-SVN: r275473