diff --git a/server/services/echo_service_test.go b/server/services/echo_service_test.go
index b38bb3c11..1cc81a83c 100644
--- a/server/services/echo_service_test.go
+++ b/server/services/echo_service_test.go
@@ -24,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	durpb "github.com/golang/protobuf/ptypes/duration"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
@@ -34,6 +33,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
diff --git a/server/services/iam_policy_service.go b/server/services/iam_policy_service.go
index f2e30481a..45043c888 100644
--- a/server/services/iam_policy_service.go
+++ b/server/services/iam_policy_service.go
@@ -19,9 +19,9 @@ import (
 	"sync"
 
 	iampb "cloud.google.com/go/iam/apiv1/iampb"
-	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 var missingResource error = status.Error(codes.InvalidArgument, "Missing required argument: resource")
diff --git a/server/services/identity_service.go b/server/services/identity_service.go
index 2c9a0e823..af3d651dd 100644
--- a/server/services/identity_service.go
+++ b/server/services/identity_service.go
@@ -19,13 +19,13 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 // NewIdentityServer returns a new instance of showcase identity server.
diff --git a/server/services/identity_service_test.go b/server/services/identity_service_test.go
index 799d56813..848592728 100644
--- a/server/services/identity_service_test.go
+++ b/server/services/identity_service_test.go
@@ -20,12 +20,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
diff --git a/server/services/messaging_service.go b/server/services/messaging_service.go
index 63a1e0cd7..37e496c3b 100644
--- a/server/services/messaging_service.go
+++ b/server/services/messaging_service.go
@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"cloud.google.com/go/longrunning/autogen/longrunningpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/googleapis/gapic-showcase/server"
@@ -33,6 +32,7 @@ import (
 	errdetails "google.golang.org/genproto/googleapis/rpc/errdetails"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 // NewMessagingServer returns an instance of a messaging server.
diff --git a/server/services/messaging_service_test.go b/server/services/messaging_service_test.go
index e251ce753..dfdbdf6cf 100644
--- a/server/services/messaging_service_test.go
+++ b/server/services/messaging_service_test.go
@@ -24,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/google/go-cmp/cmp"
@@ -33,6 +32,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
diff --git a/server/services/operations_service.go b/server/services/operations_service.go
index c6b86445c..31c4eaf05 100644
--- a/server/services/operations_service.go
+++ b/server/services/operations_service.go
@@ -23,13 +23,13 @@ import (
 	"time"
 
 	lropb "cloud.google.com/go/longrunning/autogen/longrunningpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 // NewOperationsServer returns a new OperationsServer for the Showcase API.
diff --git a/server/services/operations_service_test.go b/server/services/operations_service_test.go
index c10f3880e..60104a232 100644
--- a/server/services/operations_service_test.go
+++ b/server/services/operations_service_test.go
@@ -22,12 +22,12 @@ import (
 	"time"
 
 	lropb "cloud.google.com/go/longrunning/autogen/longrunningpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestGetOperation_wait(t *testing.T) {
diff --git a/server/services/testing_service_test.go b/server/services/testing_service_test.go
index d8a87bf8d..5cf5f04f3 100644
--- a/server/services/testing_service_test.go
+++ b/server/services/testing_service_test.go
@@ -19,12 +19,12 @@ import (
 	"encoding/base64"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 func Test_Session_lifecycle(t *testing.T) {
diff --git a/server/session_test.go b/server/session_test.go
index 9f74c8c77..da9f4eb41 100644
--- a/server/session_test.go
+++ b/server/session_test.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestSessionProto(t *testing.T) {
diff --git a/server/spec/v1/unary.go b/server/spec/v1/unary.go
index 02925d3bd..c6544ed6a 100644
--- a/server/spec/v1/unary.go
+++ b/server/spec/v1/unary.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/googleapis/gapic-showcase/server"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 )
 
 type unaryTest struct {
diff --git a/server/spec/v1/unary_test.go b/server/spec/v1/unary_test.go
index 4b0fa7e5f..5191a7505 100644
--- a/server/spec/v1/unary_test.go
+++ b/server/spec/v1/unary_test.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 )
 
 func Test_unaryTest_GetName(t *testing.T) {
diff --git a/server/waiter.go b/server/waiter.go
index 3b2bb434a..d171eb66d 100644
--- a/server/waiter.go
+++ b/server/waiter.go
@@ -20,9 +20,9 @@ import (
 	"time"
 
 	lropb "cloud.google.com/go/longrunning/autogen/longrunningpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
+	"google.golang.org/protobuf/proto"
 )
 
 var waiterSingleton Waiter = &waiterImpl{
diff --git a/server/waiter_test.go b/server/waiter_test.go
index 90ccdcb0f..a8e84f6c3 100644
--- a/server/waiter_test.go
+++ b/server/waiter_test.go
@@ -21,11 +21,11 @@ import (
 	"time"
 
 	lropb "cloud.google.com/go/longrunning/autogen/longrunningpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	pb "github.com/googleapis/gapic-showcase/server/genproto"
 	"google.golang.org/genproto/googleapis/rpc/status"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestGetWaiterInstance(t *testing.T) {
diff --git a/util/genrest/internal/pbinfo/pbinfo.go b/util/genrest/internal/pbinfo/pbinfo.go
index d11d01b38..9ee97b773 100644
--- a/util/genrest/internal/pbinfo/pbinfo.go
+++ b/util/genrest/internal/pbinfo/pbinfo.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	"google.golang.org/protobuf/proto"
 )
 
 // ProtoType represents a type in protobuf descriptors.