diff --git a/googleapis/api/annotations/annotations.pb.go b/googleapis/api/annotations/annotations.pb.go
index 236bae0d24368592e74a0d236b988e0b45839162..7e9e63c42ea112eb2b726d95c1a4e0bb9afdb34a 100644
--- a/googleapis/api/annotations/annotations.pb.go
+++ b/googleapis/api/annotations/annotations.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/annotations.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+package annotations
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/annotations/http.pb.go b/googleapis/api/annotations/http.pb.go
index 574a5db81bf382664641149e2b0d7233a05c4ea9..0408184bfd93521a83aac17f86deda769a488577 100644
--- a/googleapis/api/annotations/http.pb.go
+++ b/googleapis/api/annotations/http.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/http.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/authorization_config.pb.go b/googleapis/api/authorization_config.pb.go
index 44f95755b1bc7b1fdd6ddffc8b015cd1451fcd5b..ee2e18949ac881e82fa8d5397b16b53e6884bd3d 100644
--- a/googleapis/api/authorization_config.pb.go
+++ b/googleapis/api/authorization_config.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/authorization_config.proto
 
-package api // import "google.golang.org/genproto/googleapis/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/configchange/config_change.pb.go b/googleapis/api/configchange/config_change.pb.go
index 0e458bdc6d24ff8e7a890348bc2f1d01322fb29f..bb748a4874540d24573a381eac082f862fe4af56 100644
--- a/googleapis/api/configchange/config_change.pb.go
+++ b/googleapis/api/configchange/config_change.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/config_change.proto
 
-package configchange // import "google.golang.org/genproto/googleapis/api/configchange"
+package configchange
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/distribution/distribution.pb.go b/googleapis/api/distribution/distribution.pb.go
index 042e16bfd3282dcc5540db16475c7f98fd5cb54d..392b4c1c899a92b2d30bae7be02d64d634c8d1f8 100644
--- a/googleapis/api/distribution/distribution.pb.go
+++ b/googleapis/api/distribution/distribution.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/distribution.proto
 
-package distribution // import "google.golang.org/genproto/googleapis/api/distribution"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package distribution
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/experimental.pb.go b/googleapis/api/experimental.pb.go
index 7cb0be6205396b86ee7c7a514d6b1eaa55ae831e..15d20f4bc0d33370b4604506c19d2a6b12199c12 100644
--- a/googleapis/api/experimental.pb.go
+++ b/googleapis/api/experimental.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/experimental.proto
 
-package api // import "google.golang.org/genproto/googleapis/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/expr/v1alpha1/checked.pb.go b/googleapis/api/expr/v1alpha1/checked.pb.go
index cd27ed1bb73efb099a5fde6b9570a33f40ed0212..1d32b2f162ef1f917a4e5748ae51121c0cac91a8 100644
--- a/googleapis/api/expr/v1alpha1/checked.pb.go
+++ b/googleapis/api/expr/v1alpha1/checked.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/checked.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+package expr
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/expr/v1alpha1/eval.pb.go b/googleapis/api/expr/v1alpha1/eval.pb.go
index f997ce346f9b2fe068fc45a3ed19f03e96a3b2b4..ec8baf243ea953421ab3cb03aa8922c5077da398 100644
--- a/googleapis/api/expr/v1alpha1/eval.pb.go
+++ b/googleapis/api/expr/v1alpha1/eval.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/eval.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package expr
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/expr/v1alpha1/explain.pb.go b/googleapis/api/expr/v1alpha1/explain.pb.go
index b52dffa89c80a91d1d097b47e50e7a408412f1ee..37cccaa05471ed29aadc405d54d609f3d4e60480 100644
--- a/googleapis/api/expr/v1alpha1/explain.pb.go
+++ b/googleapis/api/expr/v1alpha1/explain.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/explain.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/expr/v1alpha1/syntax.pb.go b/googleapis/api/expr/v1alpha1/syntax.pb.go
index 1ef2d8fa2050837d6dc781de53d573cc55f55617..42a46c16c7cc347ba5ea42b98017657dff015b15 100644
--- a/googleapis/api/expr/v1alpha1/syntax.pb.go
+++ b/googleapis/api/expr/v1alpha1/syntax.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/syntax.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+package expr
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/expr/v1alpha1/value.pb.go b/googleapis/api/expr/v1alpha1/value.pb.go
index 1dbc75b1ec181db5a54bb02a0d6721f4e15fffbe..0f64d899ee8ae33fcdaa8cec4d05206c9f136cdb 100644
--- a/googleapis/api/expr/v1alpha1/value.pb.go
+++ b/googleapis/api/expr/v1alpha1/value.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/value.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+package expr
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/httpbody/httpbody.pb.go b/googleapis/api/httpbody/httpbody.pb.go
index 5c20aa9ee79c986092fbf1a27b02eac1092a113e..b9a17c41789f6ef066f23849e510dc33eafeee2e 100644
--- a/googleapis/api/httpbody/httpbody.pb.go
+++ b/googleapis/api/httpbody/httpbody.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/httpbody.proto
 
-package httpbody // import "google.golang.org/genproto/googleapis/api/httpbody"
+package httpbody
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/label/label.pb.go b/googleapis/api/label/label.pb.go
index d67f189ea6579d803b9ad090c4590aeed5d63410..24eb4dcfbbb8405ff179f5447818714a6aab4979 100644
--- a/googleapis/api/label/label.pb.go
+++ b/googleapis/api/label/label.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/label.proto
 
-package label // import "google.golang.org/genproto/googleapis/api/label"
+package label
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/metric/metric.pb.go b/googleapis/api/metric/metric.pb.go
index 441db4b191f8a2757f3d0aaf7ff8306630868f2b..5dcd504fe35450b485fadfe025a9d8e76bc42a0f 100644
--- a/googleapis/api/metric/metric.pb.go
+++ b/googleapis/api/metric/metric.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/metric.proto
 
-package metric // import "google.golang.org/genproto/googleapis/api/metric"
+package metric
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	label "google.golang.org/genproto/googleapis/api/label"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/monitoredres/monitored_resource.pb.go b/googleapis/api/monitoredres/monitored_resource.pb.go
index 4a8e4c4cd4a32aa269d2de3f6af4583150d6e5fc..22d875d8c3bee9c91590b034cd16f1bad5c1fc11 100644
--- a/googleapis/api/monitoredres/monitored_resource.pb.go
+++ b/googleapis/api/monitoredres/monitored_resource.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitored_resource.proto
 
-package monitoredres // import "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoredres
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	label "google.golang.org/genproto/googleapis/api/label"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/auth.pb.go b/googleapis/api/serviceconfig/auth.pb.go
index a38430ff8bacfd2419165261909e84e97e94a9f8..c62a6f27fee82771f284a33d874da9ffb1a71f5c 100644
--- a/googleapis/api/serviceconfig/auth.pb.go
+++ b/googleapis/api/serviceconfig/auth.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/auth.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/backend.pb.go b/googleapis/api/serviceconfig/backend.pb.go
index ee75451bb3f2c6d23027cb6a9f26dda76b504465..82655d9f42bce1d4a1c19b186fcaae719214b513 100644
--- a/googleapis/api/serviceconfig/backend.pb.go
+++ b/googleapis/api/serviceconfig/backend.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/backend.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/billing.pb.go b/googleapis/api/serviceconfig/billing.pb.go
index 0f46937eca6c89349394e032b8a5cf0ef124d52c..ec4511775ac479dc7a1b8410abea7f3865c0e659 100644
--- a/googleapis/api/serviceconfig/billing.pb.go
+++ b/googleapis/api/serviceconfig/billing.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/billing.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/consumer.pb.go b/googleapis/api/serviceconfig/consumer.pb.go
index 536713ec2e0168d8fb5aa71bce1b8aa64b5c643f..9b139453e2d62e0aea9a6eaf3cfed79399164c94 100644
--- a/googleapis/api/serviceconfig/consumer.pb.go
+++ b/googleapis/api/serviceconfig/consumer.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/consumer.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/context.pb.go b/googleapis/api/serviceconfig/context.pb.go
index 4bb3b44847b7cb17bcb26158a0c9eea7cd103e8a..aab8403f6665670fa90a71424100a9fafe507022 100644
--- a/googleapis/api/serviceconfig/context.pb.go
+++ b/googleapis/api/serviceconfig/context.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/context.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/control.pb.go b/googleapis/api/serviceconfig/control.pb.go
index 8927390066f12ecae182ca3d6604f3a854552128..f866a232a0c5ebb65808dd499d219bacef28d0d7 100644
--- a/googleapis/api/serviceconfig/control.pb.go
+++ b/googleapis/api/serviceconfig/control.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/control.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/documentation.pb.go b/googleapis/api/serviceconfig/documentation.pb.go
index 20d63402f73fc906d9dd42dd6a137b28f75ce195..c25e9cec5d6add56716bb44e964f0f91118e828e 100644
--- a/googleapis/api/serviceconfig/documentation.pb.go
+++ b/googleapis/api/serviceconfig/documentation.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/documentation.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/endpoint.pb.go b/googleapis/api/serviceconfig/endpoint.pb.go
index 8a703ac3456ccccd2cc04edcbb477059aaeb98b4..5316bc2eaf74bb1b11cd02485f9a67e50b6d4b85 100644
--- a/googleapis/api/serviceconfig/endpoint.pb.go
+++ b/googleapis/api/serviceconfig/endpoint.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/endpoint.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/log.pb.go b/googleapis/api/serviceconfig/log.pb.go
index 842f1acb0d9e4489b8e26f7ef3b6530e981fa7fe..2c1ace41bdfa5eb8657efae6db59de5ac9e623f0 100644
--- a/googleapis/api/serviceconfig/log.pb.go
+++ b/googleapis/api/serviceconfig/log.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/log.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	label "google.golang.org/genproto/googleapis/api/label"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/logging.pb.go b/googleapis/api/serviceconfig/logging.pb.go
index 896de1eddc5cef9b1566eac22f9b0340a0c3d117..f13bfec02f9ec5703a757f8dddbefbdb9e651b0f 100644
--- a/googleapis/api/serviceconfig/logging.pb.go
+++ b/googleapis/api/serviceconfig/logging.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/logging.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/monitoring.pb.go b/googleapis/api/serviceconfig/monitoring.pb.go
index 2f2b5d4a11db2cb7e227f0b5b2fbd2fda59eb5a7..4b6ea95abeaf8b02a7dd71faf8822280c037d72f 100644
--- a/googleapis/api/serviceconfig/monitoring.pb.go
+++ b/googleapis/api/serviceconfig/monitoring.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitoring.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/quota.pb.go b/googleapis/api/serviceconfig/quota.pb.go
index dad8adf0a6df2ec061aabaff4fa1893038ff9bbf..9a106d71ecb32c823d6601ee4e1827ef1b015d62 100644
--- a/googleapis/api/serviceconfig/quota.pb.go
+++ b/googleapis/api/serviceconfig/quota.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/quota.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/service.pb.go b/googleapis/api/serviceconfig/service.pb.go
index 88933e316f897b3df7ef735e9a494b90b3f97d08..99030b463ebf5c390509bb78ad3603802c1b069a 100644
--- a/googleapis/api/serviceconfig/service.pb.go
+++ b/googleapis/api/serviceconfig/service.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/service.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import annotations "google.golang.org/genproto/googleapis/api/annotations"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import api "google.golang.org/genproto/protobuf/api"
-import ptype "google.golang.org/genproto/protobuf/ptype"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	annotations "google.golang.org/genproto/googleapis/api/annotations"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	api "google.golang.org/genproto/protobuf/api"
+	ptype "google.golang.org/genproto/protobuf/ptype"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/source_info.pb.go b/googleapis/api/serviceconfig/source_info.pb.go
index a58ed16b1f480cb698c42bd6ab025a07e9a18801..bcc8eb96d4c9a5d99de9e9739af49e9838ba5cda 100644
--- a/googleapis/api/serviceconfig/source_info.pb.go
+++ b/googleapis/api/serviceconfig/source_info.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/source_info.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/system_parameter.pb.go b/googleapis/api/serviceconfig/system_parameter.pb.go
index f0d9e8d984da78e72c534bda56f3bd3eb71e053f..51fac137bcdcb844241f643fdb593e4ebd42b575 100644
--- a/googleapis/api/serviceconfig/system_parameter.pb.go
+++ b/googleapis/api/serviceconfig/system_parameter.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/system_parameter.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/serviceconfig/usage.pb.go b/googleapis/api/serviceconfig/usage.pb.go
index b9af3520ba6468dcaf0a63824bdd00d3d37188c7..665b676c78f341a12af1521b6eb17cd15dfd196c 100644
--- a/googleapis/api/serviceconfig/usage.pb.go
+++ b/googleapis/api/serviceconfig/usage.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/usage.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/check_error.pb.go b/googleapis/api/servicecontrol/v1/check_error.pb.go
index f228fa86daac058daeb1189e3245d62b3ce25d93..05cbe4d2f0a4019344bcb47844cb9642c5b04417 100644
--- a/googleapis/api/servicecontrol/v1/check_error.pb.go
+++ b/googleapis/api/servicecontrol/v1/check_error.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/check_error.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/distribution.pb.go b/googleapis/api/servicecontrol/v1/distribution.pb.go
index 55350df1307fbffb2925957adca91814c3201d8e..745da3755ee96464eea619e12bfeb513810229b0 100644
--- a/googleapis/api/servicecontrol/v1/distribution.pb.go
+++ b/googleapis/api/servicecontrol/v1/distribution.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/distribution.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/log_entry.pb.go b/googleapis/api/servicecontrol/v1/log_entry.pb.go
index 97cb3a0f39f8e1c99cd377fc9ec4bee8e1527a65..e024f78dab8be9d2040c7512be5c37ba99d3467d 100644
--- a/googleapis/api/servicecontrol/v1/log_entry.pb.go
+++ b/googleapis/api/servicecontrol/v1/log_entry.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/log_entry.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/metric_value.pb.go b/googleapis/api/servicecontrol/v1/metric_value.pb.go
index 76ca7d27d07433d6c3b65998702b2de1567a0163..5fd8ce96352207bf1b0e8f4fae467af05675161d 100644
--- a/googleapis/api/servicecontrol/v1/metric_value.pb.go
+++ b/googleapis/api/servicecontrol/v1/metric_value.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/metric_value.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/money"
+package servicecontrol
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/money"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/operation.pb.go b/googleapis/api/servicecontrol/v1/operation.pb.go
index f29427bb4e92836ae900b07b14c4c87d08e4694f..3755a4eec9a9dbe6700f10b00de2563b2b2e6e15 100644
--- a/googleapis/api/servicecontrol/v1/operation.pb.go
+++ b/googleapis/api/servicecontrol/v1/operation.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/operation.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package servicecontrol
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicecontrol/v1/quota_controller.pb.go b/googleapis/api/servicecontrol/v1/quota_controller.pb.go
index 29aa4a0f4cdb2907e131dc5be43d0050c4d116ff..b1ee03962612925add291c4170ecb1dc40fd95a1 100644
--- a/googleapis/api/servicecontrol/v1/quota_controller.pb.go
+++ b/googleapis/api/servicecontrol/v1/quota_controller.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/quota_controller.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/api/servicecontrol/v1/service_controller.pb.go b/googleapis/api/servicecontrol/v1/service_controller.pb.go
index b36bcfe1929a387f68cd51290b9d8d6bb55a5dd4..ec207a612c66662597cb95853b2711d9422ca7e5 100644
--- a/googleapis/api/servicecontrol/v1/service_controller.pb.go
+++ b/googleapis/api/servicecontrol/v1/service_controller.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/service_controller.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/api/servicemanagement/v1/resources.pb.go b/googleapis/api/servicemanagement/v1/resources.pb.go
index 0c31e5603bdd0504b74408383966b0a91527a4bb..eda33e618db2ca0ec886de7b39d599e896160da5 100644
--- a/googleapis/api/servicemanagement/v1/resources.pb.go
+++ b/googleapis/api/servicemanagement/v1/resources.pb.go
@@ -1,21 +1,23 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/resources.proto
 
-package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import configchange "google.golang.org/genproto/googleapis/api/configchange"
-import _ "google.golang.org/genproto/googleapis/api/metric"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package servicemanagement
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	configchange "google.golang.org/genproto/googleapis/api/configchange"
+	_ "google.golang.org/genproto/googleapis/api/metric"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/api/servicemanagement/v1/servicemanager.pb.go b/googleapis/api/servicemanagement/v1/servicemanager.pb.go
index 93e10d36dd9b8690cf921291328a363440efca36..e3e0cf6f9c50d2d851d5eca7888c6cece6548e59 100644
--- a/googleapis/api/servicemanagement/v1/servicemanager.pb.go
+++ b/googleapis/api/servicemanagement/v1/servicemanager.pb.go
@@ -1,18 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/servicemanager.proto
 
-package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package servicemanagement
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/appengine/legacy/audit_data.pb.go b/googleapis/appengine/legacy/audit_data.pb.go
index b447932c05a4e385628f7adb4894fc06b09f654f..f9b8be64f22f7177474e95d9d1f753d03ad499bd 100644
--- a/googleapis/appengine/legacy/audit_data.pb.go
+++ b/googleapis/appengine/legacy/audit_data.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/legacy/audit_data.proto
 
-package legacy // import "google.golang.org/genproto/googleapis/appengine/legacy"
+package legacy
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/logging/v1/request_log.pb.go b/googleapis/appengine/logging/v1/request_log.pb.go
index 19b4b5810e3f4ffb7efc440160aab27d94529325..c24a3bf8c25ed0ee005a06aa46fd97d6a203b7fa 100644
--- a/googleapis/appengine/logging/v1/request_log.pb.go
+++ b/googleapis/appengine/logging/v1/request_log.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/logging/v1/request_log.proto
 
-package logging // import "google.golang.org/genproto/googleapis/appengine/logging/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/app_yaml.pb.go b/googleapis/appengine/v1/app_yaml.pb.go
index 07003397720703c888f6a9e103face51b77779a1..1b596c02648dc8207e9dcb1c89e650861e1d0a82 100644
--- a/googleapis/appengine/v1/app_yaml.pb.go
+++ b/googleapis/appengine/v1/app_yaml.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/app_yaml.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package appengine
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/appengine.pb.go b/googleapis/appengine/v1/appengine.pb.go
index 7439802dc952fd22d8e4ac98d265518cb55083ab..f0d02faca0294b5d4e00ca90fe4fc263970b02e4 100644
--- a/googleapis/appengine/v1/appengine.pb.go
+++ b/googleapis/appengine/v1/appengine.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/appengine.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package appengine
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/appengine/v1/application.pb.go b/googleapis/appengine/v1/application.pb.go
index 291d43998d953a65ae29848b3b22f906dadf5df4..12e521d5f3b3775d4fdac31738d45be043c5fdac 100644
--- a/googleapis/appengine/v1/application.pb.go
+++ b/googleapis/appengine/v1/application.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/application.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/audit_data.pb.go b/googleapis/appengine/v1/audit_data.pb.go
index f92191e6bc976738f28dd203faae9b9f1399690e..7c1e522be3ab0f02a281d75cb736494e81daa2ee 100644
--- a/googleapis/appengine/v1/audit_data.pb.go
+++ b/googleapis/appengine/v1/audit_data.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/audit_data.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/iam/v1"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/deploy.pb.go b/googleapis/appengine/v1/deploy.pb.go
index 6f086ea3f7971e1b129d8b42450d2d60ace21080..bff28533d2aeba7bf10ffb4b43e75f6935f7f8c1 100644
--- a/googleapis/appengine/v1/deploy.pb.go
+++ b/googleapis/appengine/v1/deploy.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/deploy.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/instance.pb.go b/googleapis/appengine/v1/instance.pb.go
index a1ea8ba101d3cc2cf35807b6c38aa365b21415d4..d74fb2df7c3d3121e591b9bfa816ae19c7edeb1d 100644
--- a/googleapis/appengine/v1/instance.pb.go
+++ b/googleapis/appengine/v1/instance.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/instance.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/location.pb.go b/googleapis/appengine/v1/location.pb.go
index 6fb4c108432bd93101fad1d6cda61c1b7332a20b..2bc9e12017b26a5137eeed6c3609f1f2cddf0d46 100644
--- a/googleapis/appengine/v1/location.pb.go
+++ b/googleapis/appengine/v1/location.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/location.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/operation.pb.go b/googleapis/appengine/v1/operation.pb.go
index 65a25ee59873a6b700427f743d3412001be6eb68..e283e2a64371279b66b967ad928aa81ae075136e 100644
--- a/googleapis/appengine/v1/operation.pb.go
+++ b/googleapis/appengine/v1/operation.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/operation.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/service.pb.go b/googleapis/appengine/v1/service.pb.go
index 3979db12c6489f6d04ff8354be2ec6350a1045fd..65c9595a68d84fd8d04c89b592375f3cc5929b6c 100644
--- a/googleapis/appengine/v1/service.pb.go
+++ b/googleapis/appengine/v1/service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/service.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/appengine/v1/version.pb.go b/googleapis/appengine/v1/version.pb.go
index 8e73381e6b67c87f756e75742c1a65842a2962e2..9270f5e458dcf9140e95c6e88676972ef1a603a3 100644
--- a/googleapis/appengine/v1/version.pb.go
+++ b/googleapis/appengine/v1/version.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/version.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package appengine
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go b/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
index 2025559342176b5304751dc9ced7f6cbdfd89680..48b64f7bb1077b908d21f4a0bc466fe634f75bbe 100644
--- a/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
+++ b/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha1/embedded_assistant.proto
 
-package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1"
+package embedded
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go b/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
index a360860331eade30790bb3f32ebffc261ab24fa0..aa0e7326ff6fa326b8367692fe3cd52c97bc87e1 100644
--- a/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
+++ b/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha2/embedded_assistant.proto
 
-package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2"
+package embedded
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
index 752d4b2fbaf0b5097ff751b983e95d6de867753c..63c6f7e353345519395f829d39c41e7e22254c73 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package cluster
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
index efc3af0b967a8648350bc35ba59ce1be5f08ba38..e24064c8ba8e12f9822847021b0fd1a4c842775f 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
+package cluster
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
index 70449950d9dcf53dc57dc1f849d1a81abd2aad18..848b44427f324195a73271e76a9d50e293f5ddc5 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+package cluster
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
index 2d68f2c061bff240e435c941f39bfc7008d0a507..43d87bde2dfe07e19b52f3d48e2e319769438de6 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_data.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package table
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
index 3cc3a7c0655097cace2828f0401e40e4629bfe30..91825eb17f3945db91a6982f40452026b17ce933 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
+package table
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
index fb348746398c53f77eb2813302951f34783a09b6..7e71380b1f3d4756d9f1e2f64e0bbe94b9cc718d 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
+package table
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go b/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
index b194bf13265469aa1aa8a92e4f954f618adb6235..24231a562991cfea1d704030aa95383ac85be274 100644
--- a/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
+++ b/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_instance_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go b/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
index 2231a7f24928710c9ed0d9493a70c606ef42d9d2..dda1723e87955918c2be8bb23f56a896fd16aec5 100644
--- a/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
+++ b/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_table_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/admin/v2/common.pb.go b/googleapis/bigtable/admin/v2/common.pb.go
index 7d5a43d4956121e40273dff7255068e52bede621..b45dfcbceaff8688f6fcd67d22930f28a3394749 100644
--- a/googleapis/bigtable/admin/v2/common.pb.go
+++ b/googleapis/bigtable/admin/v2/common.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/common.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/v2/instance.pb.go b/googleapis/bigtable/admin/v2/instance.pb.go
index 6f2ab72fd6b665308f29a125081d26ed2a94d3ad..22eacacac5c66421c8459fc04a68ef236649c7d8 100644
--- a/googleapis/bigtable/admin/v2/instance.pb.go
+++ b/googleapis/bigtable/admin/v2/instance.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/instance.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/admin/v2/table.pb.go b/googleapis/bigtable/admin/v2/table.pb.go
index b19e6c78d21aaddf32ce76d38d481ea7d81ff762..c79a15144ce2bc8b6d80f4081162dbd1ed77e5bc 100644
--- a/googleapis/bigtable/admin/v2/table.pb.go
+++ b/googleapis/bigtable/admin/v2/table.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/table.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/v1/bigtable_data.pb.go b/googleapis/bigtable/v1/bigtable_data.pb.go
index be2942f44f4ad0444968c444232d768f8206ce9c..d8d0143366001c0d9c54ab25d86b3a8327c0af5e 100644
--- a/googleapis/bigtable/v1/bigtable_data.pb.go
+++ b/googleapis/bigtable/v1/bigtable_data.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_data.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/v1/bigtable_service.pb.go b/googleapis/bigtable/v1/bigtable_service.pb.go
index 8e952db664c6a22397357a75fa9fe90a09cb10e5..a4b2e04c4a00f6f71d1fccfc6bf2d38ca35c154b 100644
--- a/googleapis/bigtable/v1/bigtable_service.pb.go
+++ b/googleapis/bigtable/v1/bigtable_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/v1/bigtable_service_messages.pb.go b/googleapis/bigtable/v1/bigtable_service_messages.pb.go
index 90827383fe27951b9db52b171564be5e6e32b96f..b006074eebba7316da5039b6bfa01e7bcecce0a0 100644
--- a/googleapis/bigtable/v1/bigtable_service_messages.pb.go
+++ b/googleapis/bigtable/v1/bigtable_service_messages.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service_messages.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package bigtable
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bigtable/v2/bigtable.pb.go b/googleapis/bigtable/v2/bigtable.pb.go
index e42a8020a207841cf6bbd8d37a3a3d3b8a4c9738..a216894b096cf4e58c9e6a18a067b3dba6076ae1 100644
--- a/googleapis/bigtable/v2/bigtable.pb.go
+++ b/googleapis/bigtable/v2/bigtable.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/bigtable.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package bigtable
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/bigtable/v2/data.pb.go b/googleapis/bigtable/v2/data.pb.go
index c476be4ee536bb4fba41dfa98dc48b54641772d9..654a4fcfde0414d4f250786a4ffe7dbc77eb2634 100644
--- a/googleapis/bigtable/v2/data.pb.go
+++ b/googleapis/bigtable/v2/data.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/data.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/bytestream/bytestream.pb.go b/googleapis/bytestream/bytestream.pb.go
index f6056010df866ff70e4f93fba4b07301dcfa03cc..01369e2a1bddf73919664cee803cfe4e7b381d3c 100644
--- a/googleapis/bytestream/bytestream.pb.go
+++ b/googleapis/bytestream/bytestream.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bytestream/bytestream.proto
 
-package bytestream // import "google.golang.org/genproto/googleapis/bytestream"
+package bytestream
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/asset/v1beta1/asset_service.pb.go b/googleapis/cloud/asset/v1beta1/asset_service.pb.go
index dcb55aefeeaae0ee431cc31117e0b350b1793ca8..92a0c1af12fc15a4200d2002c084ee286b6fc7ac 100644
--- a/googleapis/cloud/asset/v1beta1/asset_service.pb.go
+++ b/googleapis/cloud/asset/v1beta1/asset_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1beta1/asset_service.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package asset
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/asset/v1beta1/assets.pb.go b/googleapis/cloud/asset/v1beta1/assets.pb.go
index 0fccbb3d7b47c70a016664705fa6c89c534974bf..1bdf8d4d08509428edee726a8a5426059b87972a 100644
--- a/googleapis/cloud/asset/v1beta1/assets.pb.go
+++ b/googleapis/cloud/asset/v1beta1/assets.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1beta1/assets.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package asset
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/audit/audit_log.pb.go b/googleapis/cloud/audit/audit_log.pb.go
index 2c2ab5caab22d8ef1ca4090c1bdcbf9ae6e965bf..6b3eb78995ab815a6b6df1dc43d3886e5ade7382 100644
--- a/googleapis/cloud/audit/audit_log.pb.go
+++ b/googleapis/cloud/audit/audit_log.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/audit/audit_log.proto
 
-package audit // import "google.golang.org/genproto/googleapis/cloud/audit"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package audit
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go b/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
index 06307887ad3dc59959d008ff6141591e61c543f1..87296d2bf15ee87fa14fc87c2363582f6fa1b890 100644
--- a/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
+++ b/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/annotation_payload.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/classification.pb.go b/googleapis/cloud/automl/v1beta1/classification.pb.go
index 75424ecf18dac9e31c7c16573814a616562c4297..75cd4ae688aaa3d8b6ad78c890a7b0efdfcc8cae 100644
--- a/googleapis/cloud/automl/v1beta1/classification.pb.go
+++ b/googleapis/cloud/automl/v1beta1/classification.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/classification.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/data_items.pb.go b/googleapis/cloud/automl/v1beta1/data_items.pb.go
index 5c1b22c8226f5bb0d8ea835514620870e135edba..5bc416053b98aa1a9adba7371ddb0bc71076d7e5 100644
--- a/googleapis/cloud/automl/v1beta1/data_items.pb.go
+++ b/googleapis/cloud/automl/v1beta1/data_items.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/data_items.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/dataset.pb.go b/googleapis/cloud/automl/v1beta1/dataset.pb.go
index a63f8a6b1ab981cae4c3125f6d924d3fe2aaed6c..da5f2450df776e054b0b3f16363d8378fbc0a740 100644
--- a/googleapis/cloud/automl/v1beta1/dataset.pb.go
+++ b/googleapis/cloud/automl/v1beta1/dataset.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/dataset.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/image.pb.go b/googleapis/cloud/automl/v1beta1/image.pb.go
index 830592846d3ec041fc49ed1f94bfa381b687d7cf..ebdcc57cae0e9cf0bab393673bd186508d182741 100644
--- a/googleapis/cloud/automl/v1beta1/image.pb.go
+++ b/googleapis/cloud/automl/v1beta1/image.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/image.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/io.pb.go b/googleapis/cloud/automl/v1beta1/io.pb.go
index 8e52089c855c6db5479044f783c8b89de526b31f..379cc96921e7c57c900305a0f1ccab3bead6da9d 100644
--- a/googleapis/cloud/automl/v1beta1/io.pb.go
+++ b/googleapis/cloud/automl/v1beta1/io.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/io.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/model.pb.go b/googleapis/cloud/automl/v1beta1/model.pb.go
index 4d4a4fb7f97a0524843406a766613f9856d067a4..899363dab2ea4cd1fdb21059047e19f1f8128d0a 100644
--- a/googleapis/cloud/automl/v1beta1/model.pb.go
+++ b/googleapis/cloud/automl/v1beta1/model.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/model.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go b/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
index 35f0c554397fedad2a54a5939d346b9059d782f7..3729187e4820cfaec9d8b6e7944afd3e20242710 100644
--- a/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
+++ b/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/model_evaluation.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/operations.pb.go b/googleapis/cloud/automl/v1beta1/operations.pb.go
index c29835e5763791f9ed998b01644995ee456209bd..8a0b90eacc6d6cd0ffdcb5891f404f29aad82165 100644
--- a/googleapis/cloud/automl/v1beta1/operations.pb.go
+++ b/googleapis/cloud/automl/v1beta1/operations.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/operations.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/prediction_service.pb.go b/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
index fb744b70aa2245c23dc91dc56d67bd3d80f36021..ebf7c5b3176652dc5a1d1ec5797a68c9e1667dde 100644
--- a/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
+++ b/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/prediction_service.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/automl/v1beta1/service.pb.go b/googleapis/cloud/automl/v1beta1/service.pb.go
index 397f45eefd9b5fd78fa66f0bbaabb1a9ff039825..1ebac95623a02525099dd2af5da61dfb832c955a 100644
--- a/googleapis/cloud/automl/v1beta1/service.pb.go
+++ b/googleapis/cloud/automl/v1beta1/service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/service.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package automl
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/automl/v1beta1/text.pb.go b/googleapis/cloud/automl/v1beta1/text.pb.go
index 6698937e94b9be964066a69b95996645ee16148d..ac98703fc5ed3173166fe556f44521fb2bfdd48e 100644
--- a/googleapis/cloud/automl/v1beta1/text.pb.go
+++ b/googleapis/cloud/automl/v1beta1/text.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/text.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/automl/v1beta1/translation.pb.go b/googleapis/cloud/automl/v1beta1/translation.pb.go
index 7a918cda43afded52c5387151593cefbc7dee737..48a30e4d0b9c60d24e5d2f00cb9c30d2f0b105a2 100644
--- a/googleapis/cloud/automl/v1beta1/translation.pb.go
+++ b/googleapis/cloud/automl/v1beta1/translation.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/translation.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go b/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
index cbcd26a1ce2af882f67e0a3b74d8d56fd7cbdeb2..cbab9eceb3c6bedcc8e2d5925dbcbe6a7d2b7423 100644
--- a/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
+++ b/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
-package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package datatransfer
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go b/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
index f663e76e83e691298364aaca2ee0c8894a70f8b0..e0aee31aab7969c972f286d9f9e46e48392254d0 100644
--- a/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
+++ b/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/transfer.proto
 
-package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package datatransfer
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go b/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
index 6ffa8586f7032ba46f703c9c267ed996349cc3d2..d0d727facac2c1806b86a4f26c4591e8a36974b5 100644
--- a/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
+++ b/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/logging/v1/audit_data.proto
 
-package logging // import "google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/billing/v1/cloud_billing.pb.go b/googleapis/cloud/billing/v1/cloud_billing.pb.go
index aeff731a1343b2b45351c82dbd92b4061d19c706..b8f05df2ec3c9cb4fd3fb53bf353179a92190a55 100644
--- a/googleapis/cloud/billing/v1/cloud_billing.pb.go
+++ b/googleapis/cloud/billing/v1/cloud_billing.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/billing/v1/cloud_billing.proto
 
-package billing // import "google.golang.org/genproto/googleapis/cloud/billing/v1"
+package billing
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dataproc/v1/clusters.pb.go b/googleapis/cloud/dataproc/v1/clusters.pb.go
index cf11d176c7f24a63301c1aad357e5708d3aa6698..349de3e2f93a9f82072c0a3ae13f3e914dc902e3 100644
--- a/googleapis/cloud/dataproc/v1/clusters.pb.go
+++ b/googleapis/cloud/dataproc/v1/clusters.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/clusters.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dataproc/v1/jobs.pb.go b/googleapis/cloud/dataproc/v1/jobs.pb.go
index e41669db68f2ecdffa05ae5d8cd97b1f259935fb..66cb8b0c8c237780fcfa39d2bf303229e5e4288f 100644
--- a/googleapis/cloud/dataproc/v1/jobs.pb.go
+++ b/googleapis/cloud/dataproc/v1/jobs.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/jobs.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dataproc/v1/operations.pb.go b/googleapis/cloud/dataproc/v1/operations.pb.go
index b7ae2b0f2c1f1657a05874fc33b4ea40430731bf..68e86b28ee618cc20d45f3960cde83634f52684f 100644
--- a/googleapis/cloud/dataproc/v1/operations.pb.go
+++ b/googleapis/cloud/dataproc/v1/operations.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/operations.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/longrunning"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/dataproc/v1beta2/clusters.pb.go b/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
index 9c36c03e0dda2458b93c07504b92d81c26053be0..0b86f738cb69b0c836b4718bcc95d22db3f9312e 100644
--- a/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/clusters.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dataproc/v1beta2/jobs.pb.go b/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
index 9f34f0bcc6c1c3174bdac877793c66334d0bf1a5..8ad245c1932436c4c106c5cc5b2727c97081b84e 100644
--- a/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/jobs.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dataproc/v1beta2/operations.pb.go b/googleapis/cloud/dataproc/v1beta2/operations.pb.go
index bc69e91a214cc8795e6fdfa1ea3e775e7bd976f9..225c25e202aeedf0337ef3c7aae5d39952aeb9ab 100644
--- a/googleapis/cloud/dataproc/v1beta2/operations.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/operations.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/operations.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/dataproc/v1beta2/shared.pb.go b/googleapis/cloud/dataproc/v1beta2/shared.pb.go
index 9493c4b1df34e4654db300f044ef41a18ddcc006..ad917f89081a5952d369430d3d72c39d66f4792f 100644
--- a/googleapis/cloud/dataproc/v1beta2/shared.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/shared.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/shared.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go b/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
index 99c3183c9c4d93452cccbb6ea99925ab0f37e37a..138567544e7d06b4d5f02d1b77d764cf91f23767 100644
--- a/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/workflow_templates.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package dataproc
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/agent.pb.go b/googleapis/cloud/dialogflow/v2/agent.pb.go
index 510db3d603259f67b6838426336ee50375a3a192..19d8112a1be385c3b86de2d2cb1b60968375fee7 100644
--- a/googleapis/cloud/dialogflow/v2/agent.pb.go
+++ b/googleapis/cloud/dialogflow/v2/agent.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/agent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/context.pb.go b/googleapis/cloud/dialogflow/v2/context.pb.go
index 5a3203ec84f93f5dfda2d1bf591e1d4a0c708bc7..1b4bbee538ee640b81c350806069963a99fae67f 100644
--- a/googleapis/cloud/dialogflow/v2/context.pb.go
+++ b/googleapis/cloud/dialogflow/v2/context.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/context.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/entity_type.pb.go b/googleapis/cloud/dialogflow/v2/entity_type.pb.go
index 534779787661d06d931fb284874bb051e29fcd88..4d1e51fcd8f6bf742d441295982fe9093385dfa1 100644
--- a/googleapis/cloud/dialogflow/v2/entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2/entity_type.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/intent.pb.go b/googleapis/cloud/dialogflow/v2/intent.pb.go
index 176ef0ece216cc7881b31b0f03a518218ec90cd4..10e5fa0f80b079f635c2b373b73f84528b9675ac 100644
--- a/googleapis/cloud/dialogflow/v2/intent.pb.go
+++ b/googleapis/cloud/dialogflow/v2/intent.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/intent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/session.pb.go b/googleapis/cloud/dialogflow/v2/session.pb.go
index 4bf4920a39271ebaed45601117228d33bbb78a2f..6c4cd817359c34cae9a39ad8e9c78812c172560d 100644
--- a/googleapis/cloud/dialogflow/v2/session.pb.go
+++ b/googleapis/cloud/dialogflow/v2/session.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/session.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go b/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
index 302fc4cd010c786a1aefae51df2fc0ad126ec783..732a759fadd9c1cd52fa68d518f851c958379eca 100644
--- a/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/session_entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2/webhook.pb.go b/googleapis/cloud/dialogflow/v2/webhook.pb.go
index e9221cf0b16192e9bc827a82073086e826ac22dd..f24ed93eaacaaea813d787e9ad0bbc0f3ff7c581 100644
--- a/googleapis/cloud/dialogflow/v2/webhook.pb.go
+++ b/googleapis/cloud/dialogflow/v2/webhook.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/webhook.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/dialogflow/v2beta1/agent.pb.go b/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
index 665cf63c14ea10e8716d8185a8e013da98fb253e..e978cd1497e1bccc6b705f4a32eeb764e97b0ead 100644
--- a/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/agent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go b/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
index bb10df6d07b2050424faaa561d09a33e961af096..060c20f3137414591ea0ef4fedd6fd7701088070 100644
--- a/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/audio_config.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/dialogflow/v2beta1/context.pb.go b/googleapis/cloud/dialogflow/v2beta1/context.pb.go
index 674972c1eeb0fdaa0a67706fcac943475c9261ef..0db9c091264a457154b3cd764c3a74e7a9b2bbe3 100644
--- a/googleapis/cloud/dialogflow/v2beta1/context.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/context.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/context.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/document.pb.go b/googleapis/cloud/dialogflow/v2beta1/document.pb.go
index bc167c614c99ce69216b70faf8623e379245b1e6..cecd335cdf28bb263f3522fe33b2b29b1e582589 100644
--- a/googleapis/cloud/dialogflow/v2beta1/document.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/document.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/document.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go b/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
index 4fc0b98f061deef1610ad65f3c1cd20a46bb1785..2c0689a42bfed36a52831bdab3dd79283cf6dca9 100644
--- a/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/intent.pb.go b/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
index fe32164c5d80a4e200142572fd4c56ee384459f9..3d4f830fe445979681e934a9aeaa9290941998b3 100644
--- a/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/intent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go b/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
index 9cd786727f79e3a21ad33d00ea3edf6ce6eff789..8078ce946a3625cd478a1be25a2234e0caf1537e 100644
--- a/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/knowledge_base.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/session.pb.go b/googleapis/cloud/dialogflow/v2beta1/session.pb.go
index 8411d714fde1391e1e34944794d79118b17b14b8..a1d0ee2f42fa6155eeee3729c0a2e61efd3fbfbb 100644
--- a/googleapis/cloud/dialogflow/v2beta1/session.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/session.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go b/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
index 6df963ce57ba9a61d5fdfa3b2ed8c6b7d080e2fb..6fb536f0317a9b651d4b7047b4de1f69ecda62ac 100644
--- a/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session_entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go b/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
index 621aecaac107f1de8e6e2ad1104323b021661e97..0238c80c268c799035c3066859c2de02af1b0a5c 100644
--- a/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/webhook.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/functions/v1beta2/functions.pb.go b/googleapis/cloud/functions/v1beta2/functions.pb.go
index 30828933a80ae9f0432bf2014b61f92cd101b019..3909c752dc0fad358e03e5b55b012710a89c38db 100644
--- a/googleapis/cloud/functions/v1beta2/functions.pb.go
+++ b/googleapis/cloud/functions/v1beta2/functions.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/functions.proto
 
-package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package functions
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/functions/v1beta2/operations.pb.go b/googleapis/cloud/functions/v1beta2/operations.pb.go
index 92ada84843745347ff6ec6bb59221a405be39b47..1bbc00a2b4dbbc82dd91bb9012727c196f238c8b 100644
--- a/googleapis/cloud/functions/v1beta2/operations.pb.go
+++ b/googleapis/cloud/functions/v1beta2/operations.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/operations.proto
 
-package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package functions
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/iot/v1/device_manager.pb.go b/googleapis/cloud/iot/v1/device_manager.pb.go
index 304632df9149ddb4e9558518626ab118302f9085..91c02292d27202cf7172e1e826a0898310d02d0a 100644
--- a/googleapis/cloud/iot/v1/device_manager.pb.go
+++ b/googleapis/cloud/iot/v1/device_manager.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/device_manager.proto
 
-package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package iot
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/iot/v1/resources.pb.go b/googleapis/cloud/iot/v1/resources.pb.go
index 1056438edfc0e9e5128b76cef70f3984794b01ed..ffb09bf9a430e0cda9a4e2bdac692bd787fc4008 100644
--- a/googleapis/cloud/iot/v1/resources.pb.go
+++ b/googleapis/cloud/iot/v1/resources.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/resources.proto
 
-package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package iot
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/kms/v1/resources.pb.go b/googleapis/cloud/kms/v1/resources.pb.go
index fe445bafa7e150c6b6d2ace20e28f4d7a6ac2d16..4f283f113d4ba5410ce35506cddd8a355896bf54 100644
--- a/googleapis/cloud/kms/v1/resources.pb.go
+++ b/googleapis/cloud/kms/v1/resources.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/kms/v1/resources.proto
 
-package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package kms
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/kms/v1/service.pb.go b/googleapis/cloud/kms/v1/service.pb.go
index 429ce4c5bef94915a4822d8bb0eb29c7ad17eb8f..9788e6be27e9d26e17437eb4411d4471c3671dff 100644
--- a/googleapis/cloud/kms/v1/service.pb.go
+++ b/googleapis/cloud/kms/v1/service.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/kms/v1/service.proto
 
-package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package kms
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/language/v1/language_service.pb.go b/googleapis/cloud/language/v1/language_service.pb.go
index fd49448242b7527bc85e6b48b5598c0d1587bceb..28f2bfb46a6caa4a588fae8f3ec41ec813167586 100644
--- a/googleapis/cloud/language/v1/language_service.pb.go
+++ b/googleapis/cloud/language/v1/language_service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1"
+package language
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/language/v1beta1/language_service.pb.go b/googleapis/cloud/language/v1beta1/language_service.pb.go
index d63df48d8f111ade73b67268d1767abf0fb33ba5..2c94c74af3d445e666f15b8c504055510aa6a2c0 100644
--- a/googleapis/cloud/language/v1beta1/language_service.pb.go
+++ b/googleapis/cloud/language/v1beta1/language_service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta1/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta1"
+package language
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/language/v1beta2/language_service.pb.go b/googleapis/cloud/language/v1beta2/language_service.pb.go
index e8bf73cc9bf1409125b2f7c644c4de23f028d25c..9ea6fdc405cad90b06cbc204dd501dad02b1c336 100644
--- a/googleapis/cloud/language/v1beta2/language_service.pb.go
+++ b/googleapis/cloud/language/v1beta2/language_service.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta2/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
+package language
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/location/locations.pb.go b/googleapis/cloud/location/locations.pb.go
index b347cd2fcb2e4472e4c8aa5cfe98b42799f151b1..0496c6311b41bdbc0f563f13b825703f1ec87fa6 100644
--- a/googleapis/cloud/location/locations.pb.go
+++ b/googleapis/cloud/location/locations.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/location/locations.proto
 
-package location // import "google.golang.org/genproto/googleapis/cloud/location"
+package location
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/ml/v1/job_service.pb.go b/googleapis/cloud/ml/v1/job_service.pb.go
index c08b0e8cc3c11e2b4ab1bcee1c5970ae0569d0f2..7cb5523da25bbf875ed5ab97ce671c1fda1a53fb 100644
--- a/googleapis/cloud/ml/v1/job_service.pb.go
+++ b/googleapis/cloud/ml/v1/job_service.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/job_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
+package ml
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/ml/v1/model_service.pb.go b/googleapis/cloud/ml/v1/model_service.pb.go
index 14530d171970e59e6b353b57cfe90b1dc4d3b592..3704c6bc8ea415086c767e3b6f97c6afe657293f 100644
--- a/googleapis/cloud/ml/v1/model_service.pb.go
+++ b/googleapis/cloud/ml/v1/model_service.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/model_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package ml
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/ml/v1/operation_metadata.pb.go b/googleapis/cloud/ml/v1/operation_metadata.pb.go
index 381c648c84ea4dd26716f1492cfc3d274ede67d6..3b3d638e8200718a6f25f2e188e9b57b48761681 100644
--- a/googleapis/cloud/ml/v1/operation_metadata.pb.go
+++ b/googleapis/cloud/ml/v1/operation_metadata.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/operation_metadata.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package ml
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/ml/v1/prediction_service.pb.go b/googleapis/cloud/ml/v1/prediction_service.pb.go
index 211f51d7746bab1602176a27cd73f0bf277f10b7..acc0551ac4603e53ed58d891ff0ff0360b6635d6 100644
--- a/googleapis/cloud/ml/v1/prediction_service.pb.go
+++ b/googleapis/cloud/ml/v1/prediction_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/prediction_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
+package ml
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import httpbody "google.golang.org/genproto/googleapis/api/httpbody"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	httpbody "google.golang.org/genproto/googleapis/api/httpbody"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/ml/v1/project_service.pb.go b/googleapis/cloud/ml/v1/project_service.pb.go
index fa2b8d3bbf8e0f69acd6dcdb2c182314719f3e9e..6e8267c61cb5c75224bdd98d8b1d2d636a65f5ce 100644
--- a/googleapis/cloud/ml/v1/project_service.pb.go
+++ b/googleapis/cloud/ml/v1/project_service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/project_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
+package ml
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/oslogin/common/common.pb.go b/googleapis/cloud/oslogin/common/common.pb.go
index d16d85cf50f70a4f750987ee3cd00b01f78ef147..194a9fbe59a75ae85b36d5f6878d21c2ab9cc7db 100644
--- a/googleapis/cloud/oslogin/common/common.pb.go
+++ b/googleapis/cloud/oslogin/common/common.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/common/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package common
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/oslogin/v1/oslogin.pb.go b/googleapis/cloud/oslogin/v1/oslogin.pb.go
index 336843bb5ca4d26a47a10d31c5d582167abfa8bb..d2a07ff25da6224c3a2645f390658d868e49201e 100644
--- a/googleapis/cloud/oslogin/v1/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1/oslogin.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go b/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
index edd4db34c5e5a8ff7882ace58db0486f97333cc5..39fae9fd006297988f64efbb9045e9938626da0c 100644
--- a/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1alpha/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/oslogin/v1beta/oslogin.pb.go b/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
index 5db87402a42f0c5e39e8526da4e09cb518a5c6dc..6019a52e642f7de836a6c5e750dc4a52b0c2ad7f 100644
--- a/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1beta/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/redis/v1/cloud_redis.pb.go b/googleapis/cloud/redis/v1/cloud_redis.pb.go
index b254775cd820589a38baadfc35cbda97df94b73a..77739f2a6f154ce43904fb6a2a3bb44430fef16c 100644
--- a/googleapis/cloud/redis/v1/cloud_redis.pb.go
+++ b/googleapis/cloud/redis/v1/cloud_redis.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/redis/v1/cloud_redis.proto
 
-package redis // import "google.golang.org/genproto/googleapis/cloud/redis/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package redis
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go b/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
index 9ad36ac51d47b660fce5d10ece5b8eb857f2b96c..6a6b3bef76861b84d299283967dc951be7574385 100644
--- a/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
+++ b/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/redis/v1beta1/cloud_redis.proto
 
-package redis // import "google.golang.org/genproto/googleapis/cloud/redis/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package redis
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/resourcemanager/v2/folders.pb.go b/googleapis/cloud/resourcemanager/v2/folders.pb.go
index 7a68ea286b6f4c9ab3be16cb7456c58049c25ef8..5c8e10ea5adff95f3e88d108923d91b784a03d5b 100644
--- a/googleapis/cloud/resourcemanager/v2/folders.pb.go
+++ b/googleapis/cloud/resourcemanager/v2/folders.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/resourcemanager/v2/folders.proto
 
-package resourcemanager // import "google.golang.org/genproto/googleapis/cloud/resourcemanager/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package resourcemanager
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go b/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
index dac6d2c4bff0ae6963a1add753307aa1779a3233..be47eb99c7d6e3ba12f823deec23cb1516edf73a 100644
--- a/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
+++ b/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/resources.proto
 
-package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package runtimeconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go b/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
index 8bb336cc65083029987cc5b76a0bbfad34a662dc..e5046ec69bf0043b32278b997518e7c713cebb23 100644
--- a/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
+++ b/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto
 
-package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package runtimeconfig
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/speech/v1/cloud_speech.pb.go b/googleapis/cloud/speech/v1/cloud_speech.pb.go
index db222bce98f3ec281bfd1511891faa14ccbdc9aa..53585ab8622fa980e13ef9a5fb86655625273d45 100644
--- a/googleapis/cloud/speech/v1/cloud_speech.pb.go
+++ b/googleapis/cloud/speech/v1/cloud_speech.pb.go
@@ -1,18 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/speech/v1/cloud_speech.proto
 
-package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package speech
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go b/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
index f188cfbb4bae39ec8197ce60a63afd8358c1bfa0..b3087d36323f38140e8e0d30d2c9cd5b00fc21a9 100644
--- a/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
+++ b/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/speech/v1p1beta1/cloud_speech.proto
 
-package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package speech
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/support/common/common.pb.go b/googleapis/cloud/support/common/common.pb.go
index edd087e67f8c8967ecf7f1c64cfb2f51a28e2d9d..51ecb6ad3ea15aef888fa02df1301d7f97bd9242 100644
--- a/googleapis/cloud/support/common/common.pb.go
+++ b/googleapis/cloud/support/common/common.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/cloud/support/common"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package common
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/support/v1alpha1/cloud_support.pb.go b/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
index f541a93d4921c493b4102a08c5afc48635d17b72..411287bec547ecfd3643de869e175e90021e86b2 100644
--- a/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
+++ b/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/v1alpha1/cloud_support.proto
 
-package support // import "google.golang.org/genproto/googleapis/cloud/support/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/support/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package support
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/support/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go b/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
index 51976b9437d52730f581d9f5752745c0e27ae068..07ad2ef9c90a796a7c14f2c90840af5e69a4a4c4 100644
--- a/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
@@ -1,18 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/cloudtasks.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/code"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/code"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/tasks/v2beta2/queue.pb.go b/googleapis/cloud/tasks/v2beta2/queue.pb.go
index 8607cff1d51a856bbe1d089069146fc62723d705..dceb91b95463d83b6c59a56a2665bbf1e0efa10e 100644
--- a/googleapis/cloud/tasks/v2beta2/queue.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/queue.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/queue.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/tasks/v2beta2/target.pb.go b/googleapis/cloud/tasks/v2beta2/target.pb.go
index 49b41b66a22e0f020d9adf12570a98689a8d3e27..13fd9be224773cc8d74becc115ca646a8d0556b2 100644
--- a/googleapis/cloud/tasks/v2beta2/target.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/target.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/target.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/tasks/v2beta2/task.pb.go b/googleapis/cloud/tasks/v2beta2/task.pb.go
index c7901337203b49fe9148f0db441038171199b926..6df7b146cbf4bb65b72831f5f1418cb284eeebbc 100644
--- a/googleapis/cloud/tasks/v2beta2/task.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/task.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/task.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go b/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
index d398e17e4d20ef5f271ed05e9b1444e99c0a4cc0..8ffd8d6e9d54b3873c1dd22a5cb72ba500e74902 100644
--- a/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/cloudtasks.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/code"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/code"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/tasks/v2beta3/queue.pb.go b/googleapis/cloud/tasks/v2beta3/queue.pb.go
index d780edd89a4dabf85a3894debec97e666e0c9d71..1f3064a05be0b80216544eb5e7142f32f977a26d 100644
--- a/googleapis/cloud/tasks/v2beta3/queue.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/queue.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/queue.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/tasks/v2beta3/target.pb.go b/googleapis/cloud/tasks/v2beta3/target.pb.go
index da96f2b681fcbc3f0788053108a7f09903c91d0e..93872f3c074e8bab51c486c37c78ad3a4676c3ef 100644
--- a/googleapis/cloud/tasks/v2beta3/target.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/target.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/target.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/tasks/v2beta3/task.pb.go b/googleapis/cloud/tasks/v2beta3/task.pb.go
index 997ca3095817bf391831dcb8f408c97d39a51eb8..381ec1c57d94cf4c12ecbb296f08c3f943ada5ed 100644
--- a/googleapis/cloud/tasks/v2beta3/task.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/task.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/task.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package tasks
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go b/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
index 3240ccb38128460fce4b60079e82745c098be19c..e6a4275984cfc467cd83c2d4798c97492704d7df 100644
--- a/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
+++ b/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/texttospeech/v1/cloud_tts.proto
 
-package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
+package texttospeech
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go b/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
index be29b497561619bc23a8fc3334f64843976eb611..01483ef4350cacdcc2c765f3e91cdd66ee29f03b 100644
--- a/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
+++ b/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/texttospeech/v1beta1/cloud_tts.proto
 
-package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1"
+package texttospeech
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
index 02c4e88b01d80508b5921e158e0b053b1226ed82..6a3853a9f11116991c6c9b30301df5dd63160917 100644
--- a/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
index 3ff33cb93132c6057f9ed2819b564c46afe2877d..23103834640d3d820762cd6d6dde2488ad51d0d9 100644
--- a/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
index 74f6158f4d87dd04c59feff4ac8a48aacaa1e3ae..712279be74dbe686a28d9129176ea39bb56d4ff1 100644
--- a/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta2/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
index 4e377e9831ae0a10ea36e312f43df638a80f7e83..8aadd87401460c640acaa121692c8f4b7065fc14 100644
--- a/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1p1beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
index 5f1d665a56fe62dac491e0301e961d71d4bc2030..b13c4c5694b6b0808d5460964fde0dbdc2cecf41 100644
--- a/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1p2beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1/geometry.pb.go b/googleapis/cloud/vision/v1/geometry.pb.go
index f39a36577e2ff24adc89731253f5d5ca730f4ab1..21935c59fb1db3a44d58b54e3e1c657c74c8527d 100644
--- a/googleapis/cloud/vision/v1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1/geometry.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1/image_annotator.pb.go b/googleapis/cloud/vision/v1/image_annotator.pb.go
index 4fe2120efdbacfa04a012cabeb11bb7ab95f156f..b5330925bab6ef1ca2d402a8f755fac73478d556 100644
--- a/googleapis/cloud/vision/v1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1/image_annotator.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1/text_annotation.pb.go b/googleapis/cloud/vision/v1/text_annotation.pb.go
index 5d9614741495a9d7060afff00636b0f661ee35dd..02341ef28b3373a33da913cabfe06e135bbe20bc 100644
--- a/googleapis/cloud/vision/v1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1/text_annotation.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1/web_detection.pb.go b/googleapis/cloud/vision/v1/web_detection.pb.go
index c80020293f609272ab89eb9a27af57face955e23..031b43fa14fadb4a61d1d3d746d0c9755f2e76da 100644
--- a/googleapis/cloud/vision/v1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1/web_detection.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p1beta1/geometry.pb.go b/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
index 0bf441c5b181f03f4902e30649ddc054012ba22c..3ed6312b5c37104479a37a316f10002f5d929ece 100644
--- a/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
index 4a09f810dee472059d425e2cd4487aabb3e75e55..8e6fca7e666c8e49461772eeb21f957a7843ed9f 100644
--- a/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
index e39a23ac31b3d94227cc19f91d7040f6273cf2f2..30a34762743d1840b2fce593ddd92006df778344 100644
--- a/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
index 2dd358961672947445f913e60af8d693e245380d..36faf8da0486c0f972afad06da94a342ca1d9d11 100644
--- a/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p2beta1/geometry.pb.go b/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
index 7b511a0c32448d83199d7762791536ddf43f9016..3d2b9a4d79a717ea15127220f5ce782e163f49bc 100644
--- a/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
index 496ccf1d90f1adacfe303709d07d60d922e3af19..55bcadc478ed5003c8cf5146bdf0e181f84d064f 100644
--- a/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
index 6f366ca51a6f11b3c6e5f95d2ae6037f55629e0d..b96ddd8e2c085ebd269d36313607d962f74b95ea 100644
--- a/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
index 4fa5db9f9982063c5be1e6ab6147affaffb316e0..3e802e26b1841fb3e299dce48cae91b1233707d7 100644
--- a/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p3beta1/geometry.pb.go b/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
index 613713dd466b79f8ab6b387c686bcdfd5d799c08..24a6ece8a84b5c56ccb38380cffcfe5b42eb0b85 100644
--- a/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
index 56c49afca87a2365972ee0572d6ba0945362f3d2..fb78014ec7af5907cb26c2c0985ba223e5f8ba7a 100644
--- a/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1p3beta1/product_search.pb.go b/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
index 71592e9bdea8e36b8104e0afe24948aaeb6b9bb1..83ee165e8790fd9f6a77dfad58f04540a4a33089 100644
--- a/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/product_search.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go b/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
index ff9ffe8b0644bdef87bc20b41fe7720e9241c177..8530f1d13bd71591dafff933ed598956b9fcf22c 100644
--- a/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/product_search_service.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
index 12e39318c1d99f831c3e3f51fb132c2a021d272f..74de5b00e37312478e8768ce97875aa15d97b6ca 100644
--- a/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
index f856dd1f0581aa747acba8a78abd5cb7fe6587e7..106171760ad23d491f22c149b4ccbd1957a18c33 100644
--- a/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package vision
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
index e1cde16c443db5e4678093d226996efd4ae1b98c..c7b387d26eaa71b9126d6f30b8066c4b7bd084e1 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
index 4149965f0db8e179ee319ca2ded891d5ed452ae7..ad6e22e666eb601a65153ad543d45699a949d0eb 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
index 20a04fd6c864ab82e344c1caa14c060121dcd3a7..9e64cbc415ac6b50b733cd1221c4845c3ffa4928 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
index b8f83b0617fa416de01920e2d5361dd96119d368..d8cf92ddae612274ba6bd9d3361dd5f038cedeaa 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
index f7e969e428fe7eb19a8bf84269e06a1b1288eaaa..64804da337c17bbc4e7b705c4d89046d27c2ea1b 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package websecurityscanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
index 0cdd88361bc126ad2415aafffb7edb739b38541c..88443c3e6be1f3234be2354793e364211e5ae989 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
index 947674b984363d2928b41f4f8964143a68ed4617..4ffd731e45c10add1a027bff947d058eb69dab45 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package websecurityscanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/container/v1/cluster_service.pb.go b/googleapis/container/v1/cluster_service.pb.go
index cc5cfcac4dc0eb3dead7ee14ba6d35d178b4b86e..277916c22c3e8761baeeb982e61f13cc6e04db9b 100644
--- a/googleapis/container/v1/cluster_service.pb.go
+++ b/googleapis/container/v1/cluster_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1"
+package container
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/container/v1alpha1/cluster_service.pb.go b/googleapis/container/v1alpha1/cluster_service.pb.go
index 6f4965088cffdf8a6fa2d5eefcdc164ece2045a2..87b34458d14686984f7f2335641c4b1f188a1671 100644
--- a/googleapis/container/v1alpha1/cluster_service.pb.go
+++ b/googleapis/container/v1alpha1/cluster_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1alpha1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1alpha1"
+package container
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/container/v1beta1/cluster_service.pb.go b/googleapis/container/v1beta1/cluster_service.pb.go
index 678fcb93115bb6ed68b6444bb921fdc1f865608f..fd1cf1337d902867a34a20d1a0524eff58072a8d 100644
--- a/googleapis/container/v1beta1/cluster_service.pb.go
+++ b/googleapis/container/v1beta1/cluster_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1beta1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1beta1"
+package container
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/datastore/admin/v1/datastore_admin.pb.go b/googleapis/datastore/admin/v1/datastore_admin.pb.go
index 1742800d2fa92bb4c4b86f5cf7267bd7577682ea..590c40cdfcecb75d6a8770437cce58446c261935 100644
--- a/googleapis/datastore/admin/v1/datastore_admin.pb.go
+++ b/googleapis/datastore/admin/v1/datastore_admin.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/datastore/admin/v1/index.pb.go b/googleapis/datastore/admin/v1/index.pb.go
index ed6fc154eb2d3b614d4325a4b25c9580089a08ca..f2f0d573318486e835d63a860619d5487db7037e 100644
--- a/googleapis/datastore/admin/v1/index.pb.go
+++ b/googleapis/datastore/admin/v1/index.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go b/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
index ebf6c0746b32a8ce2fa2352fe73a570be582850c..775e050f073dbd232f3f026ceb7c1be98c41c06f 100644
--- a/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
+++ b/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1beta1/datastore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/datastore/v1/datastore.pb.go b/googleapis/datastore/v1/datastore.pb.go
index 1d1dc67f80aa95e069e1a94b8aac14714acf7012..4323454954585ac9fc0d05e48f89d6cd9f845f5c 100644
--- a/googleapis/datastore/v1/datastore.pb.go
+++ b/googleapis/datastore/v1/datastore.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/datastore.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/datastore/v1/entity.pb.go b/googleapis/datastore/v1/entity.pb.go
index 149e16b8a5b562f1760d1524c98366c50e25cd40..b2b65eeeb07ed0a0481f7b8fd6b6065a7a5028d6 100644
--- a/googleapis/datastore/v1/entity.pb.go
+++ b/googleapis/datastore/v1/entity.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/entity.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package datastore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/datastore/v1/query.pb.go b/googleapis/datastore/v1/query.pb.go
index 79f32166471dbdbe3e21e78c85a6e3c56962e916..97061a62ebfa7967681aa3cbd0118dfbe2b90f2d 100644
--- a/googleapis/datastore/v1/query.pb.go
+++ b/googleapis/datastore/v1/query.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/query.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+package datastore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/datastore/v1beta3/datastore.pb.go b/googleapis/datastore/v1beta3/datastore.pb.go
index 6af2357c9ebe22fc734ab605510ce0d2f9e26687..3134ad56cc5e1829978724e731f63487e1095800 100644
--- a/googleapis/datastore/v1beta3/datastore.pb.go
+++ b/googleapis/datastore/v1beta3/datastore.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/datastore.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/datastore/v1beta3/entity.pb.go b/googleapis/datastore/v1beta3/entity.pb.go
index 51d91aec8e41190c629080870bd27236a72f0331..fc6b0e1d4b47478aba6a90111ddb66797f3386b0 100644
--- a/googleapis/datastore/v1beta3/entity.pb.go
+++ b/googleapis/datastore/v1beta3/entity.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/entity.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package datastore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/datastore/v1beta3/query.pb.go b/googleapis/datastore/v1beta3/query.pb.go
index ea4fdca6ab0ff8a290f3858c058a1f99aa32051b..e6dd69aede74a965864f053d38fba7fb318c934a 100644
--- a/googleapis/datastore/v1beta3/query.pb.go
+++ b/googleapis/datastore/v1beta3/query.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/query.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+package datastore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/build/v1/build_events.pb.go b/googleapis/devtools/build/v1/build_events.pb.go
index 6831822d67f1f3aab9568161c040f2411fc20d55..60909e9345a03dcbb38c60d02a2af96ca47fa730 100644
--- a/googleapis/devtools/build/v1/build_events.pb.go
+++ b/googleapis/devtools/build/v1/build_events.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_events.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
+package build
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/build/v1/build_status.pb.go b/googleapis/devtools/build/v1/build_status.pb.go
index 5924915df6c6ccf1382c3cd016796fab566d6542..5e210ed86068351c10049b3f5591794743c6cc40 100644
--- a/googleapis/devtools/build/v1/build_status.pb.go
+++ b/googleapis/devtools/build/v1/build_status.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_status.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package build
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/build/v1/publish_build_event.pb.go b/googleapis/devtools/build/v1/publish_build_event.pb.go
index 2b878765d02cfe2d25547a1fbc39b9c59818e9d4..3092b168fa92fc5f3f6568622c48d19809f5a02e 100644
--- a/googleapis/devtools/build/v1/publish_build_event.pb.go
+++ b/googleapis/devtools/build/v1/publish_build_event.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/publish_build_event.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package build
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go b/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
index b149662d3ea1a282d9a97c9f44c280fb6d0419eb..7fa85420872fe302800e1ff77a008d491c9d7074 100644
--- a/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
+++ b/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
@@ -1,18 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudbuild/v1/cloudbuild.proto
 
-package cloudbuild // import "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/httpbody"
-import _ "google.golang.org/genproto/googleapis/cloud/audit"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package cloudbuild
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/httpbody"
+	_ "google.golang.org/genproto/googleapis/cloud/audit"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/clouddebugger/v2/controller.pb.go b/googleapis/devtools/clouddebugger/v2/controller.pb.go
index 0888e21111a33e4bd501c76f0e452b59162408cc..f33499056b77b99c8c3663a3c6aa844b00fd8dac 100644
--- a/googleapis/devtools/clouddebugger/v2/controller.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/controller.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/controller.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
+package clouddebugger
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/clouddebugger/v2/data.pb.go b/googleapis/devtools/clouddebugger/v2/data.pb.go
index 9fe900a9667efa23c9d4e5bae35867c5d8118c2e..3e0f3ca54ec516dacf3cf20087e8e6ec1af9a5bd 100644
--- a/googleapis/devtools/clouddebugger/v2/data.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/data.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/data.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
+package clouddebugger
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/clouddebugger/v2/debugger.pb.go b/googleapis/devtools/clouddebugger/v2/debugger.pb.go
index 31fc72e00b9df7bd8f12e8dc8b45e25b0088dd03..4a9b388c65ec4da556ee7d4546c8aa4ee8f9662a 100644
--- a/googleapis/devtools/clouddebugger/v2/debugger.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/debugger.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/debugger.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
+package clouddebugger
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
index 710311a5485bc963b4e83f3d074be24b85093f43..03d827f00f1e6876b3bd54ce1324025243dc93b3 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/common.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/monitoredres"
+package clouderrorreporting
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/monitoredres"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
index 5c29e88b5eab0dd1bb0ed0dab17150945cc7b9b1..ab2b3d3a4a786c2774e442ded2140d2afb7b43f7 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_group_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
+package clouderrorreporting
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
index 28376af5d85aaa33c59470ba9c9715ab9a2fb4e3..f0f34ec80877e4e2500a61e00b7ae7f69f69f908 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouderrorreporting
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
index dafd599f3c5d9c0ba4aa22b6686bad5c98af1fcf..287c510dc72ac9bae06976d1529d4d1cd36deab0 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
+package clouderrorreporting
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/cloudprofiler/v2/profiler.pb.go b/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
index 6059477f08fed1957812dc61f7efefe62a9474da..c573ca45d2358bc80b96758e78a60d2e6c57a046 100644
--- a/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
+++ b/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudprofiler/v2/profiler.proto
 
-package cloudprofiler // import "google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package cloudprofiler
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/cloudtrace/v1/trace.pb.go b/googleapis/devtools/cloudtrace/v1/trace.pb.go
index 61853a34a5c19e98a2db4e5f45333daaa93f7c8c..24c562eb17f072134560ebbbfdf0b7ea61a7da01 100644
--- a/googleapis/devtools/cloudtrace/v1/trace.pb.go
+++ b/googleapis/devtools/cloudtrace/v1/trace.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v1/trace.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package cloudtrace
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/cloudtrace/v2/trace.pb.go b/googleapis/devtools/cloudtrace/v2/trace.pb.go
index c5af5c85d7eadcee8314e6eb1219bc3aa3555b8e..0e2458fe62a9127b08a0e6e7a54809a4230396c4 100644
--- a/googleapis/devtools/cloudtrace/v2/trace.pb.go
+++ b/googleapis/devtools/cloudtrace/v2/trace.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/trace.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package cloudtrace
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/cloudtrace/v2/tracing.pb.go b/googleapis/devtools/cloudtrace/v2/tracing.pb.go
index 6a12a2800cc92e5eae468c892eb85d388760f88d..08aa1b5ea824c23555900cbf984bbc7ef2e52b82 100644
--- a/googleapis/devtools/cloudtrace/v2/tracing.pb.go
+++ b/googleapis/devtools/cloudtrace/v2/tracing.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/tracing.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package cloudtrace
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
index 7d3c66e6de58e8fb00f3d6a98274b0482529db65..7f29ff17245dd2ec43db7687bb73203830231a42 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
index 582da57d9b8017a569f5da47b6785eb6385febd3..2d88cb94b2fce5d35ad4f731586a4d0a7744589b 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
@@ -1,19 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/containeranalysis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package containeranalysis
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
index 39e87406d8975f616fa885bb6f837671c08562b3..ecfcc1b11026d9af09c60b59ece44a0aa6cba754 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/image_basis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
index e308fba0d40ba59bb6a958d6a2c63899cf1cbeb8..462a38d9a9bab035a1ebb85be74e13f3bf56b0f5 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
index 4fc2d2f9f99bd3f1fd8527a8e8b7ccb063985461..cddf78ea0d54551157ec056a4f8a0ebd774caac3 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/provenance.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package containeranalysis
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
index 602aa0dc11988d4cd272a20ff1bdb0b26319e280..56b061635898783a25f7acba68521956ab826c1c 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/source_context.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go b/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
index 8a27baceebbe1e1dec69829ca69162a97e11120a..a410d813c52b80b1cbb781c2d507eea0c27de2e9 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/attestation/attestation.proto
 
-package attestation // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
+package attestation
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go b/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
index 3c64161a7dd5d7b085dcc0e5482edbd48d2d5731..91ff2b5bdc4e903b30d099f0024d793529cabdfd 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/build/build.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
+package build
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go b/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
index 6606b96b39ad5cffe3501383abbeb90aa49e348f..bf45bb49c721403f651e9c252b34d8239ea00b2f 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/common/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go b/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
index 0f1707d44b0c5307491ab8dda145402133a072ab..7b9c2b5bf975ab7aa103dd7bf429210a94311b69 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/containeranalysis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package containeranalysis
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go b/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
index db33a1fa155a4b4ccbc23d4b54b3f85f3ec40b42..73b7e6ba22c5b5bc273edb804e34d467b58e398e 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/deployment/deployment.proto
 
-package deployment // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
+package deployment
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go b/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
index d1bea3e770d6f3ec49dc8ccca161a334c60e9fd4..c0c2082230439759bce724eee56b3b7a31386527 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/discovery/discovery.proto
 
-package discovery // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package discovery
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go b/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
index f163977ce3be5ba13cb47a73c1951da12fabc2d0..0433e3b3e0e8c102244049daf60a6c6db3f0eb58 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
@@ -1,24 +1,26 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/grafeas/grafeas.proto
 
-package grafeas // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/grafeas"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import attestation "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
-import build "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import deployment "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
-import discovery "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
-import image "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
-import _package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
-import provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
-import vulnerability "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package grafeas
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	attestation "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
+	build "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	deployment "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
+	discovery "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
+	image "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
+	_package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+	provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+	vulnerability "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go b/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
index 4c9b18d7d537ede0941a0bf848eb5bd42d18900f..14b3cc7db4de3458d755f8e8606e6f6d66d9cd7e 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/image/image.proto
 
-package image // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
+package image
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go b/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
index 29bd36fade0092be2d31e8e9848c0fe48e9ea04a..16a1cb64797fcbf5532e1798df7b7ea698f7342f 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/package/package.proto
 
-package _package // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+package _package
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go b/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
index 5b035b0d9d9d673f663f9b0343bf50ba2b432b5e..375456563e293c7003d03c707bfaf98dafd2e432 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/provenance/provenance.proto
 
-package provenance // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import source "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+package provenance
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	source "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go b/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
index 3a6517fa7c1bff701bdfb0fc437ad18f41b514bd..e30ac46e89c40daec5faaef7f9b6a957bdb43f59 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/source/source.proto
 
-package source // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+package source
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go b/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
index a6d487768982df25de48731bc287406e25121cdf..e8000df810576066c37e9b89901763e0c90bbbfb 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.proto
 
-package vulnerability // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import _package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+package vulnerability
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	_package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go b/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
index 5bf15845e1010c018720c8c13d34ecd23e24e400..bdcb19ca081944ae469a82bc0dba566d77b2c6ce 100644
--- a/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
+++ b/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteexecution/v1test/remote_execution.proto
 
-package remoteexecution // import "google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package remoteexecution
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/remoteworkers/v1test2/bots.pb.go b/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
index 27aa922d41f33ea61405056853142bb9d1b94813..d2e07be65fbd0fc692583b926756037805e55902 100644
--- a/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/bots.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package remoteworkers
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/remoteworkers/v1test2/command.pb.go b/googleapis/devtools/remoteworkers/v1test2/command.pb.go
index 76a8522ad1bdf6f482a45aa6d7f53d168691caa9..9c8bca79677e686fa5873e934676b61377caa562 100644
--- a/googleapis/devtools/remoteworkers/v1test2/command.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/command.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/command.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package remoteworkers
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go b/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
index 1447cdc06765e045a44b6efb4ecab0efe679590c..01523466c0fb161dc0100fb0dfd5b97b45b54de9 100644
--- a/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/tasks.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package remoteworkers
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/remoteworkers/v1test2/worker.pb.go b/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
index 2fb2262ec8353e11c269c44f754660317ee8ba05..daf514de8b4369dcf4126f7218a8503521986bb1 100644
--- a/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/worker.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
+package remoteworkers
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/action.pb.go b/googleapis/devtools/resultstore/v2/action.pb.go
index d8ccd616f212b71d2a02e59c7ecfea7b06c0b1a9..927fe43973e0791d9b8f3c5067165bfb804058f7 100644
--- a/googleapis/devtools/resultstore/v2/action.pb.go
+++ b/googleapis/devtools/resultstore/v2/action.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/action.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/common.pb.go b/googleapis/devtools/resultstore/v2/common.pb.go
index cc7aa1b78dff4c8c641c407cd506bc3ee0151a2b..6751caf8f41ff537723ca55bc37d456530ab2c24 100644
--- a/googleapis/devtools/resultstore/v2/common.pb.go
+++ b/googleapis/devtools/resultstore/v2/common.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/common.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+package resultstore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/configuration.pb.go b/googleapis/devtools/resultstore/v2/configuration.pb.go
index e0616e5cafad96df28e274e2adeb1efc4dc6040e..190fa88a31312aca31a01630f1073ac59c87c8c7 100644
--- a/googleapis/devtools/resultstore/v2/configuration.pb.go
+++ b/googleapis/devtools/resultstore/v2/configuration.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/configuration.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/configured_target.pb.go b/googleapis/devtools/resultstore/v2/configured_target.pb.go
index 95673cd555eb81d4b01833b5f5d76a9e211cfbcc..56499cffa2cadb450547886402052d2a3800e479 100644
--- a/googleapis/devtools/resultstore/v2/configured_target.pb.go
+++ b/googleapis/devtools/resultstore/v2/configured_target.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/configured_target.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/coverage.pb.go b/googleapis/devtools/resultstore/v2/coverage.pb.go
index 5701d7387e6a87a2368d2b8bbb69c15735ab6ce3..b8091196e2c0500bd6fdec0299a9b023449fb133 100644
--- a/googleapis/devtools/resultstore/v2/coverage.pb.go
+++ b/googleapis/devtools/resultstore/v2/coverage.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/coverage.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/coverage_summary.pb.go b/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
index 24066106f5a995f50d6047230964c0b4e1a8733e..4a0c9cc4fb365390ecf0cf7304d718eb7465c12b 100644
--- a/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
+++ b/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/coverage_summary.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/file.pb.go b/googleapis/devtools/resultstore/v2/file.pb.go
index 757e154b36b9cdf5d78998e637229e0a9e1d1688..d3188b58b9a45ec2cb94abc5e3e57df52ea9359e 100644
--- a/googleapis/devtools/resultstore/v2/file.pb.go
+++ b/googleapis/devtools/resultstore/v2/file.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/file.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+package resultstore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/file_set.pb.go b/googleapis/devtools/resultstore/v2/file_set.pb.go
index 800e5cfe55195da77daec316e469ce0dd9bd112c..cc1a725898eb67f5e040230ca687c7b87a45dfff 100644
--- a/googleapis/devtools/resultstore/v2/file_set.pb.go
+++ b/googleapis/devtools/resultstore/v2/file_set.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/file_set.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/invocation.pb.go b/googleapis/devtools/resultstore/v2/invocation.pb.go
index 95b460f4c63acfb771f6f8a8f26c4c9778d20d30..9ed5be4bf878833b7f241201e99a3f1a3b55e07c 100644
--- a/googleapis/devtools/resultstore/v2/invocation.pb.go
+++ b/googleapis/devtools/resultstore/v2/invocation.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/invocation.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/resultstore_download.pb.go b/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
index 59395699211b01b122beb084ed8343824860c835..b530eff0f2665e0717cd5df5a8252a99ea918b50 100644
--- a/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
+++ b/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/resultstore_download.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go b/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
index ad0e5ca2a3cdcc588df326d4267df39f64b85079..7e6972146b10f82fd7e2aa0757c3769815ffcfb4 100644
--- a/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
+++ b/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/resultstore_file_download.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/devtools/resultstore/v2/target.pb.go b/googleapis/devtools/resultstore/v2/target.pb.go
index 5b9e20c771fab8b93ec886ebf936a65ddecba617..a33355c651a46ff579f1fd50e512852ddf009253 100644
--- a/googleapis/devtools/resultstore/v2/target.pb.go
+++ b/googleapis/devtools/resultstore/v2/target.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/target.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/resultstore/v2/test_suite.pb.go b/googleapis/devtools/resultstore/v2/test_suite.pb.go
index 3a1cde52481f1c6d59af8599a638d1c9f804720e..6a459df5b2bab0d3135a48b8486e4dc4df793f4f 100644
--- a/googleapis/devtools/resultstore/v2/test_suite.pb.go
+++ b/googleapis/devtools/resultstore/v2/test_suite.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/test_suite.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/source/v1/source_context.pb.go b/googleapis/devtools/source/v1/source_context.pb.go
index e6a95e4f9c3221f2db4382039f1f8ad1e4414309..947eaca3a4785f13f553869ef0d70895ba9b1cec 100644
--- a/googleapis/devtools/source/v1/source_context.pb.go
+++ b/googleapis/devtools/source/v1/source_context.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/source/v1/source_context.proto
 
-package source // import "google.golang.org/genproto/googleapis/devtools/source/v1"
+package source
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go b/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
index f2c7450407c283d6b72ed95727d89d7df94ea27b..5276cde9d11053920b7725f327c6779812c0704f 100644
--- a/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
+++ b/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/sourcerepo/v1/sourcerepo.proto
 
-package sourcerepo // import "google.golang.org/genproto/googleapis/devtools/sourcerepo/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package sourcerepo
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/example/library/v1/library.pb.go b/googleapis/example/library/v1/library.pb.go
index 052781829ef3523ca47eab174343bb4921c51017..13a25eb0ce18b8cac570b7f57a564f3371454a70 100644
--- a/googleapis/example/library/v1/library.pb.go
+++ b/googleapis/example/library/v1/library.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/example/library/v1/library.proto
 
-package library // import "google.golang.org/genproto/googleapis/example/library/v1"
+package library
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go b/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
index c847b49c58b2a1fd7fa6ddea6030a398b040f8d5..feda83bbbd26ab62e477240a2381518fc4734818 100644
--- a/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
+++ b/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/firestore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/firestore/admin/v1beta1/index.pb.go b/googleapis/firestore/admin/v1beta1/index.pb.go
index feb8ab1dc85baf1e08c8eeac8dc718c0d9a4613c..fea03f1d82121ea78abfa4b60ef50a7eefbf2df3 100644
--- a/googleapis/firestore/admin/v1beta1/index.pb.go
+++ b/googleapis/firestore/admin/v1beta1/index.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/admin/v1beta2/field.pb.go b/googleapis/firestore/admin/v1beta2/field.pb.go
index 757067de8097ca037eb914064ebf84c5c94786f1..9877c3c3bb06de95133f65fd623a8b1a47dd45ff 100644
--- a/googleapis/firestore/admin/v1beta2/field.pb.go
+++ b/googleapis/firestore/admin/v1beta2/field.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/field.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go b/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
index 9b4843b24007529ff8ceba0d9c06183c82721ce9..7e30d8dd783b38b052bff5816230f46b8e32787a 100644
--- a/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
+++ b/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/firestore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/firestore/admin/v1beta2/index.pb.go b/googleapis/firestore/admin/v1beta2/index.pb.go
index 4045233d1f1ec3a9eda7aba20bb30c3851611aed..f67dcf2a9c78d1146fa85e40814a22ae92df3382 100644
--- a/googleapis/firestore/admin/v1beta2/index.pb.go
+++ b/googleapis/firestore/admin/v1beta2/index.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/admin/v1beta2/operation.pb.go b/googleapis/firestore/admin/v1beta2/operation.pb.go
index 70de0024cad5fbf98de90ae13622e27286a138d4..b21bf3c2c3d8eac905e16a3a33b7cd0afdbb307e 100644
--- a/googleapis/firestore/admin/v1beta2/operation.pb.go
+++ b/googleapis/firestore/admin/v1beta2/operation.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/operation.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/v1beta1/common.pb.go b/googleapis/firestore/v1beta1/common.pb.go
index dd6f7ff3dddbe7ebaa1ded7c3a7ee780614bd13e..1a8f4577708c7c759ce3c76c8d1d85908bcbd74c 100644
--- a/googleapis/firestore/v1beta1/common.pb.go
+++ b/googleapis/firestore/v1beta1/common.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/common.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package firestore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/v1beta1/document.pb.go b/googleapis/firestore/v1beta1/document.pb.go
index 87c01d12a71218a9fb6ff31bc259ac5f40ad39fd..54fd315b2ae81df42ac3340d59dfe7c66e797748 100644
--- a/googleapis/firestore/v1beta1/document.pb.go
+++ b/googleapis/firestore/v1beta1/document.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/document.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package firestore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/v1beta1/firestore.pb.go b/googleapis/firestore/v1beta1/firestore.pb.go
index 54b21dc382fb0a570d265844f7271239b9a4a730..ae5a1405d6dcc387afb5456df112523fb447778b 100644
--- a/googleapis/firestore/v1beta1/firestore.pb.go
+++ b/googleapis/firestore/v1beta1/firestore.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/firestore.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package firestore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/firestore/v1beta1/query.pb.go b/googleapis/firestore/v1beta1/query.pb.go
index 86722b2221920dcc4f633fae472d49477aecc062..b13a02002fd3ac2933a838fcb187dcca28420a3a 100644
--- a/googleapis/firestore/v1beta1/query.pb.go
+++ b/googleapis/firestore/v1beta1/query.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/query.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package firestore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/firestore/v1beta1/write.pb.go b/googleapis/firestore/v1beta1/write.pb.go
index 461adc379db855e8e0e89645688b77e521317546..567aa4d1432ccfb6ede66db5155bdecb95282e4f 100644
--- a/googleapis/firestore/v1beta1/write.pb.go
+++ b/googleapis/firestore/v1beta1/write.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/write.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package firestore
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/annotations.pb.go b/googleapis/genomics/v1/annotations.pb.go
index 7c013ea29eee1a21f6070dff55168b4c85a84962..b2fb9ad6243bda3b28825093e4e6090172199cae 100644
--- a/googleapis/genomics/v1/annotations.pb.go
+++ b/googleapis/genomics/v1/annotations.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/annotations.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/genomics/v1/cigar.pb.go b/googleapis/genomics/v1/cigar.pb.go
index 60fb6af8675bf29ba86335f9a0738bc566eb3343..9ddddc58ee206e497a115b670d520e86905116a6 100644
--- a/googleapis/genomics/v1/cigar.pb.go
+++ b/googleapis/genomics/v1/cigar.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/cigar.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/datasets.pb.go b/googleapis/genomics/v1/datasets.pb.go
index a16e85ba2d7bc2e3c2be49a8f2de9d78ecfc9f69..e75ed34bdc48ded9f3c8c2a91fe7ff2a977663ec 100644
--- a/googleapis/genomics/v1/datasets.pb.go
+++ b/googleapis/genomics/v1/datasets.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/datasets.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/genomics/v1/operations.pb.go b/googleapis/genomics/v1/operations.pb.go
index 6ae5279d3bdaab0cff56952dce87c68e4c8d291d..06818b4a013accac297312fdd6b35953f4285fa6 100644
--- a/googleapis/genomics/v1/operations.pb.go
+++ b/googleapis/genomics/v1/operations.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/operations.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/position.pb.go b/googleapis/genomics/v1/position.pb.go
index 868f67fc5c4efbd4ad11c78d9d4c5d16fb12ef04..e2bf43b68e5e70d95d1bd0a2ca9e9572c3db1cc8 100644
--- a/googleapis/genomics/v1/position.pb.go
+++ b/googleapis/genomics/v1/position.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/position.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/range.pb.go b/googleapis/genomics/v1/range.pb.go
index d86b93548f73f12185e77b8e8ebe5f605e0f4f5f..cc66db07d67960284555fbf92ec4bc10d4f1c0b8 100644
--- a/googleapis/genomics/v1/range.pb.go
+++ b/googleapis/genomics/v1/range.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/range.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/readalignment.pb.go b/googleapis/genomics/v1/readalignment.pb.go
index 3723ef713f49423b7f8ead951f97eafcc76e0700..0d628286cbf7011e2e3a25278af5c0a1b82ec695 100644
--- a/googleapis/genomics/v1/readalignment.pb.go
+++ b/googleapis/genomics/v1/readalignment.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readalignment.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/readgroup.pb.go b/googleapis/genomics/v1/readgroup.pb.go
index 0b71e07d098e69b56eab518bd13a67de0bf984bf..71e0bf82af99a16b52a2ca380a093f98b1e1ea81 100644
--- a/googleapis/genomics/v1/readgroup.pb.go
+++ b/googleapis/genomics/v1/readgroup.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroup.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/readgroupset.pb.go b/googleapis/genomics/v1/readgroupset.pb.go
index 926b59e880349ae50887622dbc9b38b5c80948a6..1a3df62e8c4c5dcfb8409cb5abca8130c05e13f4 100644
--- a/googleapis/genomics/v1/readgroupset.pb.go
+++ b/googleapis/genomics/v1/readgroupset.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroupset.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/genomics/v1/reads.pb.go b/googleapis/genomics/v1/reads.pb.go
index f95931370b474e9b9b2d38881640ddcd4723623e..67d664f3111fbaae98d021d2a11f69bca0ccf9cb 100644
--- a/googleapis/genomics/v1/reads.pb.go
+++ b/googleapis/genomics/v1/reads.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/reads.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/genomics/v1/references.pb.go b/googleapis/genomics/v1/references.pb.go
index 0f3d2b46c1899fa8560cdec41c231e383fd0f060..245be5163bf7944d7288b773b4229659189efb40 100644
--- a/googleapis/genomics/v1/references.pb.go
+++ b/googleapis/genomics/v1/references.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/references.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/genomics/v1/variants.pb.go b/googleapis/genomics/v1/variants.pb.go
index 2d569aef4c2d3ae89fddc34607909ffc8702782b..e92ea00515ba9bbe7942cd6ce79df8070d32a682 100644
--- a/googleapis/genomics/v1/variants.pb.go
+++ b/googleapis/genomics/v1/variants.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/variants.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/genomics/v1alpha2/pipelines.pb.go b/googleapis/genomics/v1alpha2/pipelines.pb.go
index 5521b2b10f89869192994eff8a4982e98655c4c7..00fede2747079b41634cf6579bf88f493e0774f9 100644
--- a/googleapis/genomics/v1alpha2/pipelines.pb.go
+++ b/googleapis/genomics/v1alpha2/pipelines.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1alpha2/pipelines.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1alpha2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import code "google.golang.org/genproto/googleapis/rpc/code"
+package genomics
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	code "google.golang.org/genproto/googleapis/rpc/code"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/home/graph/v1/device.pb.go b/googleapis/home/graph/v1/device.pb.go
index 71ab98f7caac0ccc255e46ab7f0bb8cd39e4e125..c02149fda27ddc408d2ec9675bc5357dc1a14ba9 100644
--- a/googleapis/home/graph/v1/device.pb.go
+++ b/googleapis/home/graph/v1/device.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/home/graph/v1/device.proto
 
-package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+package graph
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/home/graph/v1/homegraph.pb.go b/googleapis/home/graph/v1/homegraph.pb.go
index 167f81771f037927ca4812bce9faff53e33b6953..4cd6d0dd72dbeb72f4d67ccf9eb96d95f0659753 100644
--- a/googleapis/home/graph/v1/homegraph.pb.go
+++ b/googleapis/home/graph/v1/homegraph.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/home/graph/v1/homegraph.proto
 
-package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package graph
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/iam/admin/v1/iam.pb.go b/googleapis/iam/admin/v1/iam.pb.go
index 8bbdcdaa78f4f7d3b06700ed13649f6fbd377bb3..e17759f33391147fd782227e2cb2475f62beac86 100644
--- a/googleapis/iam/admin/v1/iam.pb.go
+++ b/googleapis/iam/admin/v1/iam.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/admin/v1/iam.proto
 
-package admin // import "google.golang.org/genproto/googleapis/iam/admin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/iam/credentials/v1/common.pb.go b/googleapis/iam/credentials/v1/common.pb.go
index 6e5c86413dd220cb3a10ba64ebf20d5d29d47cea..64135e939420e9d5d103d24c18795ccd278f7e69 100644
--- a/googleapis/iam/credentials/v1/common.pb.go
+++ b/googleapis/iam/credentials/v1/common.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/credentials/v1/common.proto
 
-package credentials // import "google.golang.org/genproto/googleapis/iam/credentials/v1"
+package credentials
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -24,8 +26,6 @@ type GenerateAccessTokenRequest struct {
 	// The resource name of the service account for which the credentials
 	// are requested, in the following format:
 	// `projects/-/serviceAccounts/{ACCOUNT_EMAIL_OR_UNIQUEID}`.
-	// Using `-` as a wildcard for the project will infer the project from
-	// the account.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The sequence of service accounts in a delegation chain. Each service
 	// account must be granted the `roles/iam.serviceAccountTokenCreator` role
@@ -157,8 +157,6 @@ type SignBlobRequest struct {
 	// The resource name of the service account for which the credentials
 	// are requested, in the following format:
 	// `projects/-/serviceAccounts/{ACCOUNT_EMAIL_OR_UNIQUEID}`.
-	// Using `-` as a wildcard for the project will infer the project from
-	// the account.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The sequence of service accounts in a delegation chain. Each service
 	// account must be granted the `roles/iam.serviceAccountTokenCreator` role
@@ -274,8 +272,6 @@ type SignJwtRequest struct {
 	// The resource name of the service account for which the credentials
 	// are requested, in the following format:
 	// `projects/-/serviceAccounts/{ACCOUNT_EMAIL_OR_UNIQUEID}`.
-	// Using `-` as a wildcard for the project will infer the project from
-	// the account.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The sequence of service accounts in a delegation chain. Each service
 	// account must be granted the `roles/iam.serviceAccountTokenCreator` role
@@ -391,8 +387,6 @@ type GenerateIdTokenRequest struct {
 	// The resource name of the service account for which the credentials
 	// are requested, in the following format:
 	// `projects/-/serviceAccounts/{ACCOUNT_EMAIL_OR_UNIQUEID}`.
-	// Using `-` as a wildcard for the project will infer the project from
-	// the account.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The sequence of service accounts in a delegation chain. Each service
 	// account must be granted the `roles/iam.serviceAccountTokenCreator` role
@@ -506,6 +500,167 @@ func (m *GenerateIdTokenResponse) GetToken() string {
 	return ""
 }
 
+type GenerateIdentityBindingAccessTokenRequest struct {
+	// The resource name of the service account for which the credentials
+	// are requested, in the following format:
+	// `projects/-/serviceAccounts/{ACCOUNT_EMAIL_OR_UNIQUEID}`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Code to identify the scopes to be included in the OAuth 2.0 access token.
+	// See https://developers.google.com/identity/protocols/googlescopes for more
+	// information.
+	// At least one value required.
+	Scope []string `protobuf:"bytes,2,rep,name=scope,proto3" json:"scope,omitempty"`
+	// Required. Input token.
+	// Must be in JWT format according to
+	// RFC7523 (https://tools.ietf.org/html/rfc7523)
+	// and must have 'kid' field in the header.
+	// Supported signing algorithms: RS256 (RS512, ES256, ES512 coming soon).
+	// Mandatory payload fields (along the lines of RFC 7523, section 3):
+	// - iss: issuer of the token. Must provide a discovery document at
+	//        $iss/.well-known/openid-configuration . The document needs to be
+	//        formatted according to section 4.2 of the OpenID Connect Discovery
+	//        1.0 specification.
+	// - iat: Issue time in seconds since epoch. Must be in the past.
+	// - exp: Expiration time in seconds since epoch. Must be less than 48 hours
+	//        after iat. We recommend to create tokens that last shorter than 6
+	//        hours to improve security unless business reasons mandate longer
+	//        expiration times. Shorter token lifetimes are generally more secure
+	//        since tokens that have been exfiltrated by attackers can be used for
+	//        a shorter time. you can configure the maximum lifetime of the
+	//        incoming token in the configuration of the mapper.
+	//        The resulting Google token will expire within an hour or at "exp",
+	//        whichever is earlier.
+	// - sub: JWT subject, identity asserted in the JWT.
+	// - aud: Configured in the mapper policy. By default the service account
+	//        email.
+	//
+	// Claims from the incoming token can be transferred into the output token
+	// accoding to the mapper configuration. The outgoing claim size is limited.
+	// Outgoing claims size must be less than 4kB serialized as JSON without
+	// whitespace.
+	//
+	// Example header:
+	// {
+	//   "alg": "RS256",
+	//   "kid": "92a4265e14ab04d4d228a48d10d4ca31610936f8"
+	// }
+	// Example payload:
+	// {
+	//   "iss": "https://accounts.google.com",
+	//   "iat": 1517963104,
+	//   "exp": 1517966704,
+	//   "aud": "https://iamcredentials.googleapis.com/",
+	//   "sub": "113475438248934895348",
+	//   "my_claims": {
+	//     "additional_claim": "value"
+	//   }
+	// }
+	Jwt                  string   `protobuf:"bytes,3,opt,name=jwt,proto3" json:"jwt,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GenerateIdentityBindingAccessTokenRequest) Reset() {
+	*m = GenerateIdentityBindingAccessTokenRequest{}
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) String() string { return proto.CompactTextString(m) }
+func (*GenerateIdentityBindingAccessTokenRequest) ProtoMessage()    {}
+func (*GenerateIdentityBindingAccessTokenRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e91212214ea1422e, []int{8}
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Unmarshal(m, b)
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Marshal(b, m, deterministic)
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Merge(m, src)
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Size() int {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Size(m)
+}
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest proto.InternalMessageInfo
+
+func (m *GenerateIdentityBindingAccessTokenRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *GenerateIdentityBindingAccessTokenRequest) GetScope() []string {
+	if m != nil {
+		return m.Scope
+	}
+	return nil
+}
+
+func (m *GenerateIdentityBindingAccessTokenRequest) GetJwt() string {
+	if m != nil {
+		return m.Jwt
+	}
+	return ""
+}
+
+type GenerateIdentityBindingAccessTokenResponse struct {
+	// The OAuth 2.0 access token.
+	AccessToken string `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
+	// Token expiration time.
+	// The expiration time is always set.
+	ExpireTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *GenerateIdentityBindingAccessTokenResponse) Reset() {
+	*m = GenerateIdentityBindingAccessTokenResponse{}
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) String() string {
+	return proto.CompactTextString(m)
+}
+func (*GenerateIdentityBindingAccessTokenResponse) ProtoMessage() {}
+func (*GenerateIdentityBindingAccessTokenResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e91212214ea1422e, []int{9}
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Unmarshal(m, b)
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Marshal(b, m, deterministic)
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Merge(m, src)
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Size() int {
+	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Size(m)
+}
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse proto.InternalMessageInfo
+
+func (m *GenerateIdentityBindingAccessTokenResponse) GetAccessToken() string {
+	if m != nil {
+		return m.AccessToken
+	}
+	return ""
+}
+
+func (m *GenerateIdentityBindingAccessTokenResponse) GetExpireTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ExpireTime
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*GenerateAccessTokenRequest)(nil), "google.iam.credentials.v1.GenerateAccessTokenRequest")
 	proto.RegisterType((*GenerateAccessTokenResponse)(nil), "google.iam.credentials.v1.GenerateAccessTokenResponse")
@@ -515,6 +670,8 @@ func init() {
 	proto.RegisterType((*SignJwtResponse)(nil), "google.iam.credentials.v1.SignJwtResponse")
 	proto.RegisterType((*GenerateIdTokenRequest)(nil), "google.iam.credentials.v1.GenerateIdTokenRequest")
 	proto.RegisterType((*GenerateIdTokenResponse)(nil), "google.iam.credentials.v1.GenerateIdTokenResponse")
+	proto.RegisterType((*GenerateIdentityBindingAccessTokenRequest)(nil), "google.iam.credentials.v1.GenerateIdentityBindingAccessTokenRequest")
+	proto.RegisterType((*GenerateIdentityBindingAccessTokenResponse)(nil), "google.iam.credentials.v1.GenerateIdentityBindingAccessTokenResponse")
 }
 
 func init() {
@@ -522,38 +679,40 @@ func init() {
 }
 
 var fileDescriptor_e91212214ea1422e = []byte{
-	// 514 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0x95, 0x9b, 0xa4, 0x8d, 0x27, 0xe1, 0x43, 0x56, 0x01, 0x27, 0x50, 0x1a, 0x8c, 0x84, 0x72,
-	0xb2, 0x55, 0x10, 0xa7, 0x9e, 0x9a, 0x16, 0x55, 0x89, 0x84, 0x54, 0x99, 0x9e, 0x10, 0xc8, 0xda,
-	0xd8, 0x53, 0x6b, 0xc9, 0x7a, 0xd7, 0x78, 0x37, 0x0d, 0x39, 0x70, 0xe4, 0xc4, 0x4f, 0xe0, 0x8f,
-	0x72, 0x44, 0xde, 0xdd, 0x34, 0x51, 0x5b, 0x10, 0x12, 0xdc, 0x3c, 0x6f, 0xde, 0xcc, 0xbc, 0x7d,
-	0x3b, 0x6b, 0x78, 0x91, 0x0b, 0x91, 0x33, 0x8c, 0x28, 0x29, 0xa2, 0xb4, 0xc2, 0x0c, 0xb9, 0xa2,
-	0x84, 0xc9, 0xe8, 0xf2, 0x20, 0x4a, 0x45, 0x51, 0x08, 0x1e, 0x96, 0x95, 0x50, 0xc2, 0xeb, 0x19,
-	0x5e, 0x48, 0x49, 0x11, 0x6e, 0xf0, 0xc2, 0xcb, 0x83, 0xfe, 0x53, 0xdb, 0x42, 0x13, 0xa7, 0xf3,
-	0x8b, 0x28, 0x9b, 0x57, 0x44, 0xd1, 0x55, 0x69, 0x7f, 0xff, 0x7a, 0x5e, 0xd1, 0x02, 0xa5, 0x22,
-	0x45, 0x69, 0x08, 0xc1, 0x0f, 0x07, 0xfa, 0xa7, 0xc8, 0xb1, 0x22, 0x0a, 0x8f, 0xd2, 0x14, 0xa5,
-	0x3c, 0x17, 0x33, 0xe4, 0x31, 0x7e, 0x9e, 0xa3, 0x54, 0x9e, 0x07, 0x4d, 0x4e, 0x0a, 0xf4, 0x9d,
-	0x81, 0x33, 0x74, 0x63, 0xfd, 0xed, 0x3d, 0x01, 0x37, 0x43, 0x86, 0x39, 0x51, 0x28, 0xfd, 0xad,
-	0x41, 0x63, 0xe8, 0xc6, 0x6b, 0xc0, 0xdb, 0x85, 0x96, 0x4c, 0x45, 0x89, 0x7e, 0x53, 0x67, 0x4c,
-	0xe0, 0xbd, 0x86, 0x36, 0xa3, 0x17, 0x58, 0x4f, 0xf7, 0x77, 0x06, 0xce, 0xb0, 0xf3, 0xb2, 0x17,
-	0xda, 0x53, 0xad, 0xa4, 0x85, 0x27, 0x56, 0x7a, 0x7c, 0x45, 0x0d, 0xbe, 0xc2, 0xe3, 0x5b, 0xc5,
-	0xc9, 0x52, 0x70, 0x89, 0xde, 0x33, 0xe8, 0x12, 0x0d, 0x27, 0xaa, 0xc6, 0xad, 0xca, 0x0e, 0x59,
-	0x53, 0xbd, 0x43, 0xe8, 0xe0, 0x97, 0x92, 0x56, 0x98, 0xe8, 0xd9, 0x0d, 0x3d, 0xbb, 0x7f, 0x63,
-	0xf6, 0xf9, 0xca, 0x96, 0x18, 0x0c, 0xbd, 0x06, 0x82, 0x8f, 0x70, 0xef, 0x1d, 0xcd, 0xf9, 0x88,
-	0x89, 0xe9, 0x5f, 0x1b, 0xd2, 0xb8, 0x6e, 0x88, 0x0f, 0x3b, 0x25, 0x59, 0x32, 0x41, 0x32, 0xbf,
-	0x35, 0x70, 0x86, 0xdd, 0x78, 0x15, 0x06, 0x13, 0xb8, 0xbf, 0x6e, 0x6f, 0x8f, 0xf4, 0x00, 0xb6,
-	0x67, 0xb8, 0x4c, 0x68, 0x66, 0x27, 0xb4, 0x66, 0xb8, 0x1c, 0x67, 0xde, 0x3e, 0x74, 0x24, 0xcd,
-	0x39, 0x66, 0xc9, 0x94, 0x89, 0xa9, 0xdf, 0xd4, 0x8d, 0xc0, 0x40, 0x75, 0x7d, 0xf0, 0x01, 0xee,
-	0xd6, 0xbd, 0x26, 0x0b, 0xf5, 0xdf, 0x94, 0xba, 0x6b, 0xa5, 0xa7, 0xc6, 0x08, 0xdd, 0xfd, 0xcf,
-	0x42, 0xf7, 0xc0, 0xaa, 0x4a, 0x3e, 0x2d, 0x94, 0xbf, 0xa5, 0x53, 0xae, 0x41, 0x26, 0x0b, 0x15,
-	0x7c, 0x77, 0xe0, 0xe1, 0xea, 0x46, 0xc7, 0xd9, 0x3f, 0xae, 0x5a, 0x1f, 0xda, 0x64, 0x9e, 0x51,
-	0xe4, 0xa9, 0xb9, 0x58, 0x37, 0xbe, 0x8a, 0xbd, 0xe7, 0x70, 0x87, 0xf2, 0x94, 0xcd, 0x33, 0x4c,
-	0xb0, 0x20, 0x94, 0x69, 0xcb, 0xda, 0x71, 0xd7, 0x82, 0x6f, 0x6a, 0x2c, 0x88, 0xe0, 0xd1, 0x0d,
-	0x31, 0xf6, 0x78, 0xbb, 0xd0, 0xda, 0xdc, 0x29, 0x13, 0x8c, 0xbe, 0x39, 0xb0, 0x97, 0x8a, 0x22,
-	0xfc, 0xed, 0x83, 0x1c, 0xf5, 0xc6, 0x47, 0x6f, 0x8f, 0xd7, 0xd0, 0xb1, 0x7e, 0xc7, 0x67, 0xf5,
-	0x9a, 0x9d, 0x39, 0xef, 0x4f, 0x6c, 0x5d, 0x2e, 0x18, 0xe1, 0x79, 0x28, 0xaa, 0x3c, 0xca, 0x91,
-	0xeb, 0x25, 0x8c, 0x4c, 0x8a, 0x94, 0x54, 0xde, 0xf2, 0x3f, 0x38, 0xdc, 0x08, 0x7f, 0x3a, 0xce,
-	0x74, 0x5b, 0xd7, 0xbc, 0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x93, 0x59, 0x07, 0x42, 0x04,
-	0x00, 0x00,
+	// 560 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x6f, 0xd3, 0x4c,
+	0x10, 0x96, 0xf3, 0xd1, 0xc6, 0x93, 0xbc, 0x2f, 0x95, 0x55, 0xc0, 0x09, 0x94, 0x06, 0x23, 0xa1,
+	0xc0, 0xc1, 0x56, 0x41, 0x9c, 0x7a, 0x6a, 0x5a, 0x54, 0x25, 0x12, 0x52, 0x65, 0x7a, 0x42, 0x20,
+	0x6b, 0x63, 0x4f, 0xad, 0x25, 0xf6, 0xae, 0xf1, 0x6e, 0x1a, 0x72, 0xe0, 0xc8, 0x09, 0xfe, 0x01,
+	0x7f, 0x94, 0x23, 0xf2, 0xae, 0x13, 0x47, 0x6d, 0x41, 0xe1, 0xe3, 0xb6, 0xf3, 0xcc, 0xc7, 0xf3,
+	0xcc, 0xec, 0xce, 0xc2, 0xe3, 0x98, 0xf3, 0x38, 0x41, 0x8f, 0x92, 0xd4, 0x0b, 0x73, 0x8c, 0x90,
+	0x49, 0x4a, 0x12, 0xe1, 0x5d, 0x1e, 0x78, 0x21, 0x4f, 0x53, 0xce, 0xdc, 0x2c, 0xe7, 0x92, 0x5b,
+	0x5d, 0x1d, 0xe7, 0x52, 0x92, 0xba, 0x6b, 0x71, 0xee, 0xe5, 0x41, 0xef, 0x41, 0x59, 0x42, 0x05,
+	0x4e, 0x66, 0x17, 0x5e, 0x34, 0xcb, 0x89, 0xa4, 0xcb, 0xd4, 0xde, 0xfe, 0x55, 0xbf, 0xa4, 0x29,
+	0x0a, 0x49, 0xd2, 0x4c, 0x07, 0x38, 0xdf, 0x0c, 0xe8, 0x9d, 0x22, 0xc3, 0x9c, 0x48, 0x3c, 0x0a,
+	0x43, 0x14, 0xe2, 0x9c, 0x4f, 0x91, 0xf9, 0xf8, 0x61, 0x86, 0x42, 0x5a, 0x16, 0x34, 0x18, 0x49,
+	0xd1, 0x36, 0xfa, 0xc6, 0xc0, 0xf4, 0xd5, 0xd9, 0xba, 0x0f, 0x66, 0x84, 0x09, 0xc6, 0x44, 0xa2,
+	0xb0, 0x6b, 0xfd, 0xfa, 0xc0, 0xf4, 0x2b, 0xc0, 0xda, 0x85, 0xa6, 0x08, 0x79, 0x86, 0x76, 0x43,
+	0x79, 0xb4, 0x61, 0xbd, 0x80, 0x56, 0x42, 0x2f, 0xb0, 0x60, 0xb7, 0xb7, 0xfb, 0xc6, 0xa0, 0xfd,
+	0xac, 0xeb, 0x96, 0x5d, 0x2d, 0xa5, 0xb9, 0x27, 0xa5, 0x74, 0x7f, 0x15, 0xea, 0x7c, 0x82, 0x7b,
+	0x37, 0x8a, 0x13, 0x19, 0x67, 0x02, 0xad, 0x87, 0xd0, 0x21, 0x0a, 0x0e, 0x64, 0x81, 0x97, 0x2a,
+	0xdb, 0xa4, 0x0a, 0xb5, 0x0e, 0xa1, 0x8d, 0x1f, 0x33, 0x9a, 0x63, 0xa0, 0xb8, 0xeb, 0x8a, 0xbb,
+	0x77, 0x8d, 0xfb, 0x7c, 0x39, 0x16, 0x1f, 0x74, 0x78, 0x01, 0x38, 0xef, 0xe0, 0xd6, 0x6b, 0x1a,
+	0xb3, 0x61, 0xc2, 0x27, 0x1b, 0x0f, 0xa4, 0x7e, 0x75, 0x20, 0x36, 0x6c, 0x67, 0x64, 0x91, 0x70,
+	0x12, 0xd9, 0xcd, 0xbe, 0x31, 0xe8, 0xf8, 0x4b, 0xd3, 0x19, 0xc3, 0x4e, 0x55, 0xbe, 0x6c, 0xe9,
+	0x36, 0x6c, 0x4d, 0x71, 0x11, 0xd0, 0xa8, 0x64, 0x68, 0x4e, 0x71, 0x31, 0x8a, 0xac, 0x7d, 0x68,
+	0x0b, 0x1a, 0x33, 0x8c, 0x82, 0x49, 0xc2, 0x27, 0x76, 0x43, 0x15, 0x02, 0x0d, 0x15, 0xf9, 0xce,
+	0x5b, 0xf8, 0xbf, 0xa8, 0x35, 0x9e, 0xcb, 0x7f, 0xa6, 0xd4, 0xac, 0x94, 0x9e, 0xea, 0x41, 0xa8,
+	0xea, 0xbf, 0x16, 0xba, 0x07, 0xa5, 0xaa, 0xe0, 0xfd, 0x5c, 0xda, 0x35, 0xe5, 0x32, 0x35, 0x32,
+	0x9e, 0x4b, 0xe7, 0x8b, 0x01, 0x77, 0x96, 0x37, 0x3a, 0x8a, 0xfe, 0xf2, 0xa9, 0xf5, 0xa0, 0x45,
+	0x66, 0x11, 0x45, 0x16, 0xea, 0x8b, 0x35, 0xfd, 0x95, 0x6d, 0x3d, 0x82, 0xff, 0x28, 0x0b, 0x93,
+	0x59, 0x84, 0x01, 0xa6, 0x84, 0x26, 0x6a, 0x64, 0x2d, 0xbf, 0x53, 0x82, 0x2f, 0x0b, 0xcc, 0xf1,
+	0xe0, 0xee, 0x35, 0x31, 0x65, 0x7b, 0xbb, 0xd0, 0x5c, 0x7f, 0x53, 0xda, 0x70, 0x62, 0x78, 0x52,
+	0x25, 0x14, 0x6b, 0x28, 0x17, 0x43, 0xca, 0x22, 0xca, 0xe2, 0x0d, 0x77, 0x67, 0xb5, 0x1d, 0xb5,
+	0xf5, 0xed, 0xd8, 0x81, 0x7a, 0x31, 0x2d, 0xdd, 0x43, 0x71, 0x74, 0xbe, 0x1a, 0xf0, 0x74, 0x13,
+	0xa6, 0x3f, 0x5e, 0x84, 0xda, 0xef, 0x2c, 0xc2, 0xf0, 0xb3, 0x01, 0x7b, 0x21, 0x4f, 0xdd, 0x9f,
+	0x7e, 0x44, 0xc3, 0xee, 0xe8, 0xe8, 0xd5, 0x71, 0x05, 0x1d, 0xab, 0xff, 0xeb, 0xac, 0xa8, 0x7a,
+	0x66, 0xbc, 0x39, 0x29, 0xf3, 0x62, 0x9e, 0x10, 0x16, 0xbb, 0x3c, 0x8f, 0xbd, 0x18, 0x99, 0xe2,
+	0xf4, 0xb4, 0x8b, 0x64, 0x54, 0xdc, 0xf0, 0x0f, 0x1e, 0xae, 0x99, 0xdf, 0x0d, 0x63, 0xb2, 0xa5,
+	0x72, 0x9e, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0x19, 0x24, 0xb3, 0xc7, 0x3a, 0x05, 0x00, 0x00,
 }
diff --git a/googleapis/iam/credentials/v1/iamcredentials.pb.go b/googleapis/iam/credentials/v1/iamcredentials.pb.go
index d5b23dc7c829702bde4e0fb185c0b469c10424ab..8daf5192f660547b644ddbc5d8c31512fd169c9a 100644
--- a/googleapis/iam/credentials/v1/iamcredentials.pb.go
+++ b/googleapis/iam/credentials/v1/iamcredentials.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/credentials/v1/iamcredentials.proto
 
-package credentials // import "google.golang.org/genproto/googleapis/iam/credentials/v1"
+package credentials
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
@@ -44,6 +46,9 @@ type IAMCredentialsClient interface {
 	SignBlob(ctx context.Context, in *SignBlobRequest, opts ...grpc.CallOption) (*SignBlobResponse, error)
 	// Signs a JWT using a service account's system-managed private key.
 	SignJwt(ctx context.Context, in *SignJwtRequest, opts ...grpc.CallOption) (*SignJwtResponse, error)
+	// Exchange a JWT signed by third party identity provider to an OAuth 2.0
+	// access token
+	GenerateIdentityBindingAccessToken(ctx context.Context, in *GenerateIdentityBindingAccessTokenRequest, opts ...grpc.CallOption) (*GenerateIdentityBindingAccessTokenResponse, error)
 }
 
 type iAMCredentialsClient struct {
@@ -90,6 +95,15 @@ func (c *iAMCredentialsClient) SignJwt(ctx context.Context, in *SignJwtRequest,
 	return out, nil
 }
 
+func (c *iAMCredentialsClient) GenerateIdentityBindingAccessToken(ctx context.Context, in *GenerateIdentityBindingAccessTokenRequest, opts ...grpc.CallOption) (*GenerateIdentityBindingAccessTokenResponse, error) {
+	out := new(GenerateIdentityBindingAccessTokenResponse)
+	err := c.cc.Invoke(ctx, "/google.iam.credentials.v1.IAMCredentials/GenerateIdentityBindingAccessToken", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // IAMCredentialsServer is the server API for IAMCredentials service.
 type IAMCredentialsServer interface {
 	// Generates an OAuth 2.0 access token for a service account.
@@ -100,6 +114,9 @@ type IAMCredentialsServer interface {
 	SignBlob(context.Context, *SignBlobRequest) (*SignBlobResponse, error)
 	// Signs a JWT using a service account's system-managed private key.
 	SignJwt(context.Context, *SignJwtRequest) (*SignJwtResponse, error)
+	// Exchange a JWT signed by third party identity provider to an OAuth 2.0
+	// access token
+	GenerateIdentityBindingAccessToken(context.Context, *GenerateIdentityBindingAccessTokenRequest) (*GenerateIdentityBindingAccessTokenResponse, error)
 }
 
 func RegisterIAMCredentialsServer(s *grpc.Server, srv IAMCredentialsServer) {
@@ -178,6 +195,24 @@ func _IAMCredentials_SignJwt_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _IAMCredentials_GenerateIdentityBindingAccessToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GenerateIdentityBindingAccessTokenRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IAMCredentialsServer).GenerateIdentityBindingAccessToken(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.iam.credentials.v1.IAMCredentials/GenerateIdentityBindingAccessToken",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IAMCredentialsServer).GenerateIdentityBindingAccessToken(ctx, req.(*GenerateIdentityBindingAccessTokenRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _IAMCredentials_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "google.iam.credentials.v1.IAMCredentials",
 	HandlerType: (*IAMCredentialsServer)(nil),
@@ -198,6 +233,10 @@ var _IAMCredentials_serviceDesc = grpc.ServiceDesc{
 			MethodName: "SignJwt",
 			Handler:    _IAMCredentials_SignJwt_Handler,
 		},
+		{
+			MethodName: "GenerateIdentityBindingAccessToken",
+			Handler:    _IAMCredentials_GenerateIdentityBindingAccessToken_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/iam/credentials/v1/iamcredentials.proto",
@@ -208,29 +247,32 @@ func init() {
 }
 
 var fileDescriptor_ad032f4dbfa7437c = []byte{
-	// 372 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xbd, 0x4e, 0xc3, 0x30,
-	0x14, 0x85, 0x65, 0x24, 0x7e, 0x94, 0x01, 0xa4, 0x30, 0x51, 0x31, 0x65, 0x40, 0x22, 0x48, 0x31,
-	0x2d, 0x14, 0xa4, 0x14, 0x24, 0x5a, 0x10, 0xa8, 0x95, 0x58, 0x80, 0x89, 0xcd, 0x4d, 0xaf, 0x2c,
-	0x43, 0xe2, 0x1b, 0x62, 0xb7, 0x1d, 0x10, 0x0b, 0xaf, 0xc0, 0xca, 0xc0, 0x83, 0xf0, 0x08, 0x6c,
-	0xbc, 0x00, 0x03, 0x0f, 0xc1, 0x88, 0x92, 0x38, 0xa2, 0x12, 0x2d, 0x24, 0xa3, 0xaf, 0xcf, 0x39,
-	0xf7, 0x3b, 0xc3, 0xb5, 0x3c, 0x8e, 0xc8, 0x43, 0xa0, 0x82, 0x45, 0x34, 0x48, 0x60, 0x00, 0x52,
-	0x0b, 0x16, 0x2a, 0x3a, 0xaa, 0xa7, 0xa3, 0x89, 0x89, 0x17, 0x27, 0xa8, 0xd1, 0x5e, 0xcb, 0xf5,
-	0x9e, 0x60, 0x91, 0x37, 0xf9, 0x3b, 0xaa, 0xd7, 0xd6, 0x4d, 0x14, 0x8b, 0x05, 0x65, 0x52, 0xa2,
-	0x66, 0x5a, 0xa0, 0x34, 0xc6, 0xda, 0xc6, 0xec, 0x45, 0x01, 0x46, 0x11, 0xca, 0x5c, 0xd7, 0xf8,
-	0x98, 0xb7, 0x96, 0xbb, 0xed, 0xf3, 0xe3, 0x1f, 0x89, 0xfd, 0x46, 0xac, 0xd5, 0x33, 0x90, 0x90,
-	0x30, 0x0d, 0xed, 0x20, 0x00, 0xa5, 0xae, 0xf0, 0x16, 0xa4, 0xdd, 0xf4, 0x66, 0xc2, 0x78, 0x53,
-	0xf4, 0x17, 0x70, 0x37, 0x04, 0xa5, 0x6b, 0x7b, 0x55, 0x6d, 0x2a, 0x46, 0xa9, 0xc0, 0x39, 0x7d,
-	0x7c, 0xff, 0x7c, 0x9a, 0x3b, 0x72, 0x5a, 0x29, 0xf3, 0xbd, 0x64, 0x11, 0x1c, 0xc6, 0x09, 0xde,
-	0x40, 0xa0, 0x15, 0x75, 0xa9, 0x82, 0x64, 0x24, 0x82, 0xd4, 0x88, 0x43, 0x99, 0x4e, 0x1e, 0x7c,
-	0xfe, 0x3b, 0xcc, 0x27, 0xae, 0xfd, 0x4a, 0xac, 0x95, 0x62, 0x4f, 0x77, 0x90, 0x57, 0xa9, 0x97,
-	0x60, 0x32, 0xda, 0xa2, 0x46, 0xa3, 0x8a, 0xc5, 0x54, 0xe8, 0x64, 0x15, 0x0e, 0x9c, 0xfd, 0xaa,
-	0x15, 0x4c, 0x50, 0x8a, 0xff, 0x42, 0xac, 0xa5, 0x4b, 0xc1, 0x65, 0x27, 0xc4, 0xbe, 0xed, 0xfe,
-	0x01, 0x51, 0x88, 0x0a, 0xe0, 0xad, 0x52, 0x5a, 0x43, 0xda, 0xca, 0x48, 0x9b, 0xce, 0x76, 0x59,
-	0x52, 0x65, 0x12, 0x52, 0xc4, 0x67, 0x62, 0x2d, 0xa6, 0x89, 0xbd, 0xb1, 0xb6, 0x37, 0xff, 0xd9,
-	0xda, 0x1b, 0xeb, 0x02, 0xd0, 0x2d, 0x23, 0x35, 0x7c, 0x7e, 0xc6, 0xb7, 0xeb, 0xd0, 0x2a, 0x7c,
-	0xbd, 0xb1, 0xf6, 0x89, 0xdb, 0xe9, 0x5e, 0x9f, 0x98, 0x45, 0x1c, 0x43, 0x26, 0xb9, 0x87, 0x09,
-	0xa7, 0x1c, 0x64, 0x76, 0x00, 0x34, 0xff, 0x62, 0xb1, 0x50, 0x53, 0x6e, 0xa5, 0x35, 0xf1, 0xfc,
-	0x22, 0xa4, 0xbf, 0x90, 0x79, 0x76, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xb5, 0x16, 0x19,
-	0xc7, 0x03, 0x00, 0x00,
+	// 421 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x4f, 0x4b, 0xe3, 0x40,
+	0x18, 0xc6, 0x99, 0x1e, 0xb6, 0x4b, 0x0e, 0xbb, 0x90, 0x3d, 0x6d, 0xd9, 0x53, 0x0e, 0x0b, 0x9b,
+	0x85, 0x8c, 0xad, 0x56, 0x21, 0x55, 0xb0, 0xb1, 0x2a, 0x0d, 0x88, 0xe0, 0x9f, 0x8b, 0xb7, 0x69,
+	0x3a, 0x0c, 0xa3, 0xc9, 0x4c, 0xcc, 0x4c, 0x5b, 0x44, 0xbc, 0x78, 0xf2, 0xee, 0xd5, 0x83, 0x1f,
+	0xc4, 0x8f, 0xe0, 0xcd, 0xaf, 0xe0, 0xcd, 0x2f, 0xe0, 0x51, 0x26, 0x99, 0xd0, 0x80, 0x8d, 0x26,
+	0x78, 0xcc, 0x9b, 0xe7, 0x79, 0xde, 0xdf, 0xc3, 0x0c, 0x63, 0x38, 0x84, 0x73, 0x12, 0x62, 0x48,
+	0x51, 0x04, 0x83, 0x04, 0x8f, 0x31, 0x93, 0x14, 0x85, 0x02, 0x4e, 0xdb, 0x6a, 0x54, 0x98, 0x38,
+	0x71, 0xc2, 0x25, 0x37, 0x7f, 0x67, 0x7a, 0x87, 0xa2, 0xc8, 0x29, 0xfe, 0x9d, 0xb6, 0x5b, 0x7f,
+	0x74, 0x14, 0x8a, 0x29, 0x44, 0x8c, 0x71, 0x89, 0x24, 0xe5, 0x4c, 0x1b, 0x5b, 0x7f, 0xcb, 0x17,
+	0x05, 0x3c, 0x8a, 0x38, 0xcb, 0x74, 0x9d, 0x97, 0xa6, 0xf1, 0x63, 0xd8, 0xdf, 0xdb, 0x9a, 0x4b,
+	0xcc, 0x47, 0x60, 0xfc, 0xda, 0xc5, 0x0c, 0x27, 0x48, 0xe2, 0x7e, 0x10, 0x60, 0x21, 0x8e, 0xf8,
+	0x19, 0x66, 0x66, 0xd7, 0x29, 0x85, 0x71, 0x16, 0xe8, 0x0f, 0xf0, 0xf9, 0x04, 0x0b, 0xd9, 0x5a,
+	0xad, 0x6b, 0x13, 0x31, 0x67, 0x02, 0x5b, 0x3b, 0xd7, 0x4f, 0xcf, 0xb7, 0x8d, 0x4d, 0xab, 0xa7,
+	0x98, 0x2f, 0x19, 0x8a, 0xf0, 0x46, 0x9c, 0xf0, 0x53, 0x1c, 0x48, 0x01, 0x6d, 0x28, 0x70, 0x32,
+	0xa5, 0x81, 0x32, 0xf2, 0x09, 0x53, 0x93, 0x2b, 0x97, 0xbc, 0x0f, 0x73, 0x81, 0x6d, 0x3e, 0x00,
+	0xe3, 0x67, 0xbe, 0x67, 0x38, 0xce, 0xaa, 0xb4, 0x2b, 0x30, 0x69, 0x6d, 0x5e, 0xa3, 0x53, 0xc7,
+	0xa2, 0x2b, 0x78, 0x69, 0x85, 0x75, 0x6b, 0xad, 0x6e, 0x05, 0x1d, 0xa4, 0xf0, 0xef, 0x81, 0xf1,
+	0xfd, 0x90, 0x12, 0xe6, 0x85, 0x7c, 0x64, 0xda, 0x1f, 0x40, 0xe4, 0xa2, 0x1c, 0xf8, 0x7f, 0x25,
+	0xad, 0x26, 0xed, 0xa5, 0xa4, 0x5d, 0x6b, 0xa9, 0x2a, 0xa9, 0xd0, 0x09, 0x0a, 0xf1, 0x0e, 0x18,
+	0x4d, 0x95, 0xe8, 0xcf, 0xa4, 0xf9, 0xef, 0x93, 0xad, 0xfe, 0x4c, 0xe6, 0x80, 0x76, 0x15, 0xa9,
+	0xe6, 0x73, 0x53, 0xbe, 0x15, 0x0b, 0xd6, 0xe1, 0xf3, 0x67, 0x52, 0xe1, 0xdd, 0x34, 0x0c, 0x6b,
+	0x7e, 0x42, 0x6a, 0x89, 0xbc, 0xf0, 0x28, 0x1b, 0x53, 0x46, 0x8a, 0xd7, 0x7b, 0x50, 0xe9, 0x80,
+	0xcb, 0xec, 0x79, 0xa9, 0xed, 0x2f, 0xa6, 0xe8, 0xbe, 0xc7, 0x69, 0xdf, 0x7d, 0xcb, 0xaf, 0x7f,
+	0x73, 0xca, 0xb2, 0x5d, 0x60, 0x7b, 0xc3, 0x93, 0x81, 0xc6, 0x23, 0x3c, 0x44, 0x8c, 0x38, 0x3c,
+	0x21, 0x90, 0x60, 0x96, 0xbe, 0x05, 0x30, 0xfb, 0x85, 0x62, 0x2a, 0x16, 0x3c, 0x1b, 0xbd, 0xc2,
+	0xe7, 0x2b, 0x00, 0xa3, 0x6f, 0xa9, 0x67, 0xf9, 0x2d, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x1f, 0xfe,
+	0xa1, 0xd2, 0x04, 0x00, 0x00,
 }
diff --git a/googleapis/iam/v1/iam_policy.pb.go b/googleapis/iam/v1/iam_policy.pb.go
index 30973a90422bc3ff4684a3872056e2c20ceb1bc6..05cecb2fe037b1d5472f45a5fd56c9a7316198bc 100644
--- a/googleapis/iam/v1/iam_policy.pb.go
+++ b/googleapis/iam/v1/iam_policy.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/iam_policy.proto
 
-package iam // import "google.golang.org/genproto/googleapis/iam/v1"
+package iam
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/iam/v1/logging/audit_data.pb.go b/googleapis/iam/v1/logging/audit_data.pb.go
index 52c4f6c5eaa4a9c68f956fec6838f1a1749f4619..4f7bedcad5fcb91ed40e070434921f79373620b5 100644
--- a/googleapis/iam/v1/logging/audit_data.pb.go
+++ b/googleapis/iam/v1/logging/audit_data.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/logging/audit_data.proto
 
-package logging // import "google.golang.org/genproto/googleapis/iam/v1/logging"
+package logging
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/iam/v1/policy.pb.go b/googleapis/iam/v1/policy.pb.go
index a4c1c2cc557d558b9aedafa250954b3234365c24..193140ea5abadcfb75905adf91649ce035dc351e 100644
--- a/googleapis/iam/v1/policy.pb.go
+++ b/googleapis/iam/v1/policy.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/policy.proto
 
-package iam // import "google.golang.org/genproto/googleapis/iam/v1"
+package iam
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/logging/type/http_request.pb.go b/googleapis/logging/type/http_request.pb.go
index 8ec571fb4a94a9a74bce49fca8d7c53dbd3897a4..67a1904d677550d4aa34dd7e6703a396ba0b6e37 100644
--- a/googleapis/logging/type/http_request.pb.go
+++ b/googleapis/logging/type/http_request.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/http_request.proto
 
-package ltype // import "google.golang.org/genproto/googleapis/logging/type"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package ltype
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/logging/type/log_severity.pb.go b/googleapis/logging/type/log_severity.pb.go
index 50b6ec2a98f015506420f9f0f05c394eed5302b6..f8867010cd515d1fcb49c3a67c110fa4437d7fb3 100644
--- a/googleapis/logging/type/log_severity.pb.go
+++ b/googleapis/logging/type/log_severity.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/log_severity.proto
 
-package ltype // import "google.golang.org/genproto/googleapis/logging/type"
+package ltype
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/logging/v2/log_entry.pb.go b/googleapis/logging/v2/log_entry.pb.go
index 491b8cbabc390ecdf5c6af5f2ede8d9a4db1067f..a85adb6bb960d527d9ac4a25b3f745b6b8b63ec4 100644
--- a/googleapis/logging/v2/log_entry.pb.go
+++ b/googleapis/logging/v2/log_entry.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/log_entry.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/logging/v2/logging.pb.go b/googleapis/logging/v2/logging.pb.go
index 6c7f8942664bb967372e7ef6856cd390b1aa7765..71f6fa685ec95c88799b6d15396719907d4621c8 100644
--- a/googleapis/logging/v2/logging.pb.go
+++ b/googleapis/logging/v2/logging.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/logging/v2/logging_config.pb.go b/googleapis/logging/v2/logging_config.pb.go
index f77eebd42971833edab3ea98a39c16165d73efe1..07d75bcc7724040c152c8ab8ca32c4cf41f1192d 100644
--- a/googleapis/logging/v2/logging_config.pb.go
+++ b/googleapis/logging/v2/logging_config.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_config.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/logging/v2/logging_metrics.pb.go b/googleapis/logging/v2/logging_metrics.pb.go
index e845efd7beec98848bbd5943a105ea80b022a005..d79136e9b7474054f1d31fcbdff485dd2bd51040 100644
--- a/googleapis/logging/v2/logging_metrics.pb.go
+++ b/googleapis/logging/v2/logging_metrics.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_metrics.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import distribution "google.golang.org/genproto/googleapis/api/distribution"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package logging
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	distribution "google.golang.org/genproto/googleapis/api/distribution"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/longrunning/operations.pb.go b/googleapis/longrunning/operations.pb.go
index acb961aaaff5132d16e31e574e7cc4d203a0db7c..8f3efc786d078524def5ef8d8c5e1b031133cc9f 100644
--- a/googleapis/longrunning/operations.pb.go
+++ b/googleapis/longrunning/operations.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/longrunning/operations.proto
 
-package longrunning // import "google.golang.org/genproto/googleapis/longrunning"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package longrunning
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/monitoring/v3/alert.pb.go b/googleapis/monitoring/v3/alert.pb.go
index 70d14d10ed84d1881acbbaac9918f64f3fc0e4a6..1de12843ac3c934c14e9cc667e2c67b3d3082e6f 100644
--- a/googleapis/monitoring/v3/alert.pb.go
+++ b/googleapis/monitoring/v3/alert.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/alert.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/alert_service.pb.go b/googleapis/monitoring/v3/alert_service.pb.go
index 14d375fad884eafba0980c51d4f380f5c0a08d53..f81bb4b4700073f0bd6e45d451b068a0c7bbc7be 100644
--- a/googleapis/monitoring/v3/alert_service.pb.go
+++ b/googleapis/monitoring/v3/alert_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/alert_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/monitoring/v3/common.pb.go b/googleapis/monitoring/v3/common.pb.go
index dab621d50be52257678635b9404476efef696e1d..014b6407007727a2f6714560f572a3b8d0785de6 100644
--- a/googleapis/monitoring/v3/common.pb.go
+++ b/googleapis/monitoring/v3/common.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/common.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import distribution "google.golang.org/genproto/googleapis/api/distribution"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	distribution "google.golang.org/genproto/googleapis/api/distribution"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/dropped_labels.pb.go b/googleapis/monitoring/v3/dropped_labels.pb.go
index 1fdd08a2ddad9ad51064d69d61ed5eaeaba3c3eb..8fd717f7424c2d0a8dbcefa30711446da4f00c0e 100644
--- a/googleapis/monitoring/v3/dropped_labels.pb.go
+++ b/googleapis/monitoring/v3/dropped_labels.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/dropped_labels.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/group.pb.go b/googleapis/monitoring/v3/group.pb.go
index ab976cb7417b71c2cf38b70948dec6e811582583..d4637606f5f357c6e6d2bad074268cfb6d3d6b61 100644
--- a/googleapis/monitoring/v3/group.pb.go
+++ b/googleapis/monitoring/v3/group.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/group_service.pb.go b/googleapis/monitoring/v3/group_service.pb.go
index a13ce1a5fee0075a8e5524ef03af1ff21aa5ff50..b13a3792c9c856a8b8a20a990669f77f700f92bb 100644
--- a/googleapis/monitoring/v3/group_service.pb.go
+++ b/googleapis/monitoring/v3/group_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/monitoring/v3/metric.pb.go b/googleapis/monitoring/v3/metric.pb.go
index a3c1df2c0f995e707aa262f0da25f30801a9c14f..39232145d95aa94ca15748b7e19a025a35d53fed 100644
--- a/googleapis/monitoring/v3/metric.pb.go
+++ b/googleapis/monitoring/v3/metric.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/label"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/label"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/metric_service.pb.go b/googleapis/monitoring/v3/metric_service.pb.go
index 875fff009ec3affc9891745ff11897737c5e0888..226b17493d8ee26d9cbc80881d1c0c2f9ab888b1 100644
--- a/googleapis/monitoring/v3/metric_service.pb.go
+++ b/googleapis/monitoring/v3/metric_service.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/monitoring/v3/mutation_record.pb.go b/googleapis/monitoring/v3/mutation_record.pb.go
index 4d97516ed48925e22351b6bd64f60afa4a2f4cd8..ae841c4ba195211743f7d0b27679058e9930ce9d 100644
--- a/googleapis/monitoring/v3/mutation_record.pb.go
+++ b/googleapis/monitoring/v3/mutation_record.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/mutation_record.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/notification.pb.go b/googleapis/monitoring/v3/notification.pb.go
index 49a8e3c16c8b3bc50d376ccb97e6f79bada89b3e..df6cf10bb7dc3bc120139797569fa8eeb79fb60d 100644
--- a/googleapis/monitoring/v3/notification.pb.go
+++ b/googleapis/monitoring/v3/notification.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/notification.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import label "google.golang.org/genproto/googleapis/api/label"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	label "google.golang.org/genproto/googleapis/api/label"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/notification_service.pb.go b/googleapis/monitoring/v3/notification_service.pb.go
index 88faffed33500909be4b10a79e3bff2b2db86384..5819d7c86be891268a1024fad887270da593c89d 100644
--- a/googleapis/monitoring/v3/notification_service.pb.go
+++ b/googleapis/monitoring/v3/notification_service.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/notification_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/monitoring/v3/span_context.pb.go b/googleapis/monitoring/v3/span_context.pb.go
index a7918e1a6980b242ccf3b505864c61648d83de26..da9a0ef4b88cc4edf80a284e50977913ca42c704 100644
--- a/googleapis/monitoring/v3/span_context.pb.go
+++ b/googleapis/monitoring/v3/span_context.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/span_context.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/uptime.pb.go b/googleapis/monitoring/v3/uptime.pb.go
index 10ac04809dacf3cc0663ac385a45b3e91c25c199..7568202b7345e33ba12f91c4c2ae9f2576f0159f 100644
--- a/googleapis/monitoring/v3/uptime.pb.go
+++ b/googleapis/monitoring/v3/uptime.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/monitoring/v3/uptime_service.pb.go b/googleapis/monitoring/v3/uptime_service.pb.go
index a8904ca37384c16284322bd3b8bc5b44996d6d12..098a45bf964983f0b839f8af8307a339f17c5f1b 100644
--- a/googleapis/monitoring/v3/uptime_service.pb.go
+++ b/googleapis/monitoring/v3/uptime_service.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/privacy/dlp/v2/dlp.pb.go b/googleapis/privacy/dlp/v2/dlp.pb.go
index a9ccaad386b72be804a5dcf0edbc9ced023121ac..ca9ba5c887095889e97106115e48b44c1d889075 100644
--- a/googleapis/privacy/dlp/v2/dlp.pb.go
+++ b/googleapis/privacy/dlp/v2/dlp.pb.go
@@ -1,20 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/privacy/dlp/v2/dlp.proto
 
-package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import date "google.golang.org/genproto/googleapis/type/date"
-import dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
-import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dlp
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	date "google.golang.org/genproto/googleapis/type/date"
+	dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
+	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/privacy/dlp/v2/storage.pb.go b/googleapis/privacy/dlp/v2/storage.pb.go
index 4e0c88ec3cfd046d49eaf3cee0ad0e199d858e35..986b3bcb65ab90d3f05877939c9b986b38e74335 100644
--- a/googleapis/privacy/dlp/v2/storage.pb.go
+++ b/googleapis/privacy/dlp/v2/storage.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/privacy/dlp/v2/storage.proto
 
-package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package dlp
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/pubsub/v1/pubsub.pb.go b/googleapis/pubsub/v1/pubsub.pb.go
index 1cdf1cebd58831f691429b9c45eec1ebbf5cb59b..ec722ba13194777a074497d83514bae15ede79f9 100644
--- a/googleapis/pubsub/v1/pubsub.pb.go
+++ b/googleapis/pubsub/v1/pubsub.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1/pubsub.proto
 
-package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package pubsub
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/pubsub/v1beta2/pubsub.pb.go b/googleapis/pubsub/v1beta2/pubsub.pb.go
index cb56f82692c444a474a33b9935227e2293aaa1a7..33aed7c83c44c1f70a758c860035c3ab639cef6b 100644
--- a/googleapis/pubsub/v1beta2/pubsub.pb.go
+++ b/googleapis/pubsub/v1beta2/pubsub.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1beta2/pubsub.proto
 
-package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1beta2"
+package pubsub
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/rpc/code/code.pb.go b/googleapis/rpc/code/code.pb.go
index a482af1eb74bc89017770a71e804e3821b27b57e..40ea63ab135c7499d3cd47e9567e089c7c6277da 100644
--- a/googleapis/rpc/code/code.pb.go
+++ b/googleapis/rpc/code/code.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/code.proto
 
-package code // import "google.golang.org/genproto/googleapis/rpc/code"
+package code
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/rpc/errdetails/error_details.pb.go b/googleapis/rpc/errdetails/error_details.pb.go
index 143701128e9fda755e48a38f4168c22980883e1e..28b121df84625758cb32fa0b7ccea7e6be3d4cf2 100644
--- a/googleapis/rpc/errdetails/error_details.pb.go
+++ b/googleapis/rpc/errdetails/error_details.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/error_details.proto
 
-package errdetails // import "google.golang.org/genproto/googleapis/rpc/errdetails"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+package errdetails
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/rpc/status/status.pb.go b/googleapis/rpc/status/status.pb.go
index d45c21d828dd2161070dd21aa6235876807bfba2..f256afe5361bef5ceab4bf83dc5055ed7ca408f0 100644
--- a/googleapis/rpc/status/status.pb.go
+++ b/googleapis/rpc/status/status.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/status.proto
 
-package status // import "google.golang.org/genproto/googleapis/rpc/status"
+package status
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go b/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
index 36cc71e7af5b4cee30f4e531fc14f581c90ec98d..2437f640b2aa3f7fa11b02b01cc2e04154defb15 100644
--- a/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
+++ b/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
@@ -1,16 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/database/v1/spanner_database_admin.proto
 
-package database // import "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package database
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go b/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
index f0bf360a11be2f5448c934f821060c89ca038f4e..42e33ed936dbb7136d2f2dbdda31a9c1b6683328 100644
--- a/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
+++ b/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/instance/v1/spanner_instance_admin.proto
 
-package instance // import "google.golang.org/genproto/googleapis/spanner/admin/instance/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package instance
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/spanner/v1/keys.pb.go b/googleapis/spanner/v1/keys.pb.go
index dd9901c1227d4b113cce9c05b8eb47557c7a053e..ea1212b776c1cc91c6ae39b921a58be9da858479 100644
--- a/googleapis/spanner/v1/keys.pb.go
+++ b/googleapis/spanner/v1/keys.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/keys.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package spanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/v1/mutation.pb.go b/googleapis/spanner/v1/mutation.pb.go
index 9c4837f8ac170d57b069dce11ef64f2d494d5639..80ee004c041f77dee10c7b4aa02b12e7899a8c6c 100644
--- a/googleapis/spanner/v1/mutation.pb.go
+++ b/googleapis/spanner/v1/mutation.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/mutation.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package spanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/v1/query_plan.pb.go b/googleapis/spanner/v1/query_plan.pb.go
index dae1aa0c093fc5aacf5ca4b8e441d4583eaa026a..cd17437ddb01afc6c7def2ce4b02fb74e744810c 100644
--- a/googleapis/spanner/v1/query_plan.pb.go
+++ b/googleapis/spanner/v1/query_plan.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/query_plan.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package spanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/v1/result_set.pb.go b/googleapis/spanner/v1/result_set.pb.go
index 21bb7f066ffc4c9b96cefc84715c1ca1f4384de9..ab4bf7808b8ccad9f561b7b5880040b94c806ffa 100644
--- a/googleapis/spanner/v1/result_set.pb.go
+++ b/googleapis/spanner/v1/result_set.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/result_set.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/v1/spanner.pb.go b/googleapis/spanner/v1/spanner.pb.go
index 0cced1755d5433f762ecf245c616d6f7f77db64f..a57316b21811a5ec4d5d332e5acc630e9fb8f2b6 100644
--- a/googleapis/spanner/v1/spanner.pb.go
+++ b/googleapis/spanner/v1/spanner.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/spanner.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package spanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/spanner/v1/transaction.pb.go b/googleapis/spanner/v1/transaction.pb.go
index 760b455c12e082a95248229641472785fc0c5f44..f0c5d0ba12959c4bdbe82f0942be7eb18821e941 100644
--- a/googleapis/spanner/v1/transaction.pb.go
+++ b/googleapis/spanner/v1/transaction.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/transaction.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package spanner
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/spanner/v1/type.pb.go b/googleapis/spanner/v1/type.pb.go
index dc47916416e88d4503c095e609abda96d1b28fd3..2fa2fcd5aaf90505129bcfe8f8f499422e10c130 100644
--- a/googleapis/spanner/v1/type.pb.go
+++ b/googleapis/spanner/v1/type.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/type.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/storagetransfer/v1/transfer.pb.go b/googleapis/storagetransfer/v1/transfer.pb.go
index f8f9d6dcc94bfc8db742cc3386cb70bdff863a35..adda1c1ad9184a787f7d5aaeddf3e0750f132761 100644
--- a/googleapis/storagetransfer/v1/transfer.pb.go
+++ b/googleapis/storagetransfer/v1/transfer.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer.proto
 
-package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package storagetransfer
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/storagetransfer/v1/transfer_types.pb.go b/googleapis/storagetransfer/v1/transfer_types.pb.go
index bcc10eacba32e5153bdfd2bc87b0046696f678a0..ee9c33f9526d09138c5c45b77687bfcdbd98fd2b 100644
--- a/googleapis/storagetransfer/v1/transfer_types.pb.go
+++ b/googleapis/storagetransfer/v1/transfer_types.pb.go
@@ -1,17 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer_types.proto
 
-package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import code "google.golang.org/genproto/googleapis/rpc/code"
-import date "google.golang.org/genproto/googleapis/type/date"
-import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+package storagetransfer
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	code "google.golang.org/genproto/googleapis/rpc/code"
+	date "google.golang.org/genproto/googleapis/type/date"
+	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/streetview/publish/v1/resources.pb.go b/googleapis/streetview/publish/v1/resources.pb.go
index 7a196c710b3980d62e304a9835cb1b7ddee31364..a0ca568e5ee4e6d4d9d2eac60a7844a5504f29b6 100644
--- a/googleapis/streetview/publish/v1/resources.pb.go
+++ b/googleapis/streetview/publish/v1/resources.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/resources.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package publish
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/streetview/publish/v1/rpcmessages.pb.go b/googleapis/streetview/publish/v1/rpcmessages.pb.go
index 41cd2cf2ac6b8f3495f6e458253395d72c4ee235..41d318c0ff5c887711c9403d728517e463a6ff58 100644
--- a/googleapis/streetview/publish/v1/rpcmessages.pb.go
+++ b/googleapis/streetview/publish/v1/rpcmessages.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/rpcmessages.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package publish
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/streetview/publish/v1/streetview_publish.pb.go b/googleapis/streetview/publish/v1/streetview_publish.pb.go
index 54c0fb9ac75658191114e604cdafee815447c949..821ddb90bee548dac000aaf87827f68d2bdc7d0c 100644
--- a/googleapis/streetview/publish/v1/streetview_publish.pb.go
+++ b/googleapis/streetview/publish/v1/streetview_publish.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/streetview_publish.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
+package publish
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/googleapis/type/color/color.pb.go b/googleapis/type/color/color.pb.go
index e54efcc18f19f0fd8e87e6d6df21c8b0c5ee0a7f..fd946fd5a8aee4ec828727ec805d718dc3b9f873 100644
--- a/googleapis/type/color/color.pb.go
+++ b/googleapis/type/color/color.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/color.proto
 
-package color // import "google.golang.org/genproto/googleapis/type/color"
+package color
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/date/date.pb.go b/googleapis/type/date/date.pb.go
index 90a2c9569d14231700b3252623ef9962b558519f..a9f72bb5c73861287775bd69541d89c4145f1ac0 100644
--- a/googleapis/type/date/date.pb.go
+++ b/googleapis/type/date/date.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/date.proto
 
-package date // import "google.golang.org/genproto/googleapis/type/date"
+package date
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/dayofweek/dayofweek.pb.go b/googleapis/type/dayofweek/dayofweek.pb.go
index 8d882d80c5c04b6c7289946bbb29a0af8a22d959..072b1620914b66158408692b4f5d2b8b7f587971 100644
--- a/googleapis/type/dayofweek/dayofweek.pb.go
+++ b/googleapis/type/dayofweek/dayofweek.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/dayofweek.proto
 
-package dayofweek // import "google.golang.org/genproto/googleapis/type/dayofweek"
+package dayofweek
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/latlng/latlng.pb.go b/googleapis/type/latlng/latlng.pb.go
index e2993487d8f169872023d3afc4f2fc7c2bb7632b..0c4896a89af8b767d6afb615fea7e60345a45534 100644
--- a/googleapis/type/latlng/latlng.pb.go
+++ b/googleapis/type/latlng/latlng.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/latlng.proto
 
-package latlng // import "google.golang.org/genproto/googleapis/type/latlng"
+package latlng
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/money/money.pb.go b/googleapis/type/money/money.pb.go
index 80669025595ce2a6e8014849150629d46119f772..c66eca23e8c1f7570e9a7ae17387e861a91ab54b 100644
--- a/googleapis/type/money/money.pb.go
+++ b/googleapis/type/money/money.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/money.proto
 
-package money // import "google.golang.org/genproto/googleapis/type/money"
+package money
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/postaladdress/postal_address.pb.go b/googleapis/type/postaladdress/postal_address.pb.go
index 1571894447458f58a622e0dfd6222a0531807451..dc8f5031000435f837e5f3534d4b0677e8f8c330 100644
--- a/googleapis/type/postaladdress/postal_address.pb.go
+++ b/googleapis/type/postaladdress/postal_address.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/postal_address.proto
 
-package postaladdress // import "google.golang.org/genproto/googleapis/type/postaladdress"
+package postaladdress
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/type/timeofday/timeofday.pb.go b/googleapis/type/timeofday/timeofday.pb.go
index 1cd9b545fa9a939237662ee8d9c5818213302651..90d99dc97b00036dc5e689adcfb0c1863b63225e 100644
--- a/googleapis/type/timeofday/timeofday.pb.go
+++ b/googleapis/type/timeofday/timeofday.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/timeofday.proto
 
-package timeofday // import "google.golang.org/genproto/googleapis/type/timeofday"
+package timeofday
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/googleapis/watcher/v1/watch.pb.go b/googleapis/watcher/v1/watch.pb.go
index f906d238dca6f5f3d075f337a3b49ea480e93acb..2581dfddd132d91c20ad72a2fefa088f6ade617c 100644
--- a/googleapis/watcher/v1/watch.pb.go
+++ b/googleapis/watcher/v1/watch.pb.go
@@ -1,14 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/watcher/v1/watch.proto
 
-package watcher // import "google.golang.org/genproto/googleapis/watcher/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package watcher
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	math "math"
+)
 
 import (
 	context "golang.org/x/net/context"
diff --git a/protobuf/api/api.pb.go b/protobuf/api/api.pb.go
index 0e66afd2d2be2c08b597279599ac420645fda667..9451eb2a468f04665070ab4e7fe80e2529290769 100644
--- a/protobuf/api/api.pb.go
+++ b/protobuf/api/api.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/api.proto
 
-package api // import "google.golang.org/genproto/protobuf/api"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import ptype "google.golang.org/genproto/protobuf/ptype"
-import source_context "google.golang.org/genproto/protobuf/source_context"
+package api
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	ptype "google.golang.org/genproto/protobuf/ptype"
+	source_context "google.golang.org/genproto/protobuf/source_context"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/protobuf/field_mask/field_mask.pb.go b/protobuf/field_mask/field_mask.pb.go
index 0cd82760368e6b0bc1b1c7188c0f3ac86621d44d..73b3578cf6085d0f61469e284aaafeaa25ca9a8d 100644
--- a/protobuf/field_mask/field_mask.pb.go
+++ b/protobuf/field_mask/field_mask.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/field_mask.proto
 
-package field_mask // import "google.golang.org/genproto/protobuf/field_mask"
+package field_mask
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/protobuf/ptype/type.pb.go b/protobuf/ptype/type.pb.go
index 65f528e8c344d6e22e1bc02a7a766100d014ee2b..27b59baeb7e2fdd8de998f28a3d9b0dfad42fd17 100644
--- a/protobuf/ptype/type.pb.go
+++ b/protobuf/ptype/type.pb.go
@@ -1,13 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/type.proto
 
-package ptype // import "google.golang.org/genproto/protobuf/ptype"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import source_context "google.golang.org/genproto/protobuf/source_context"
+package ptype
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	source_context "google.golang.org/genproto/protobuf/source_context"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/protobuf/source_context/source_context.pb.go b/protobuf/source_context/source_context.pb.go
index a034a8949b7b1ef41f642c7b91632596269d9be0..3cd55ac941ca754458f7b4414e966aebdf147a24 100644
--- a/protobuf/source_context/source_context.pb.go
+++ b/protobuf/source_context/source_context.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/source_context.proto
 
-package source_context // import "google.golang.org/genproto/protobuf/source_context"
+package source_context
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal