diff -Nru golang-google-grpc-1.22.1/debian/changelog golang-google-grpc-1.22.1/debian/changelog
--- golang-google-grpc-1.22.1/debian/changelog	2019-08-02 00:12:55.000000000 +0000
+++ golang-google-grpc-1.22.1/debian/changelog	2019-08-27 02:04:33.000000000 +0000
@@ -1,3 +1,9 @@
+golang-google-grpc (1.22.1-1ubuntu1) eoan; urgency=medium
+
+  * Backport my patch from upstream to fix autopkgtests on ppc64el and s390x.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 27 Aug 2019 14:04:33 +1200
+
 golang-google-grpc (1.22.1-1) unstable; urgency=medium
 
   * New upstream version 1.22.1
diff -Nru golang-google-grpc-1.22.1/debian/control golang-google-grpc-1.22.1/debian/control
--- golang-google-grpc-1.22.1/debian/control	2019-08-02 00:12:41.000000000 +0000
+++ golang-google-grpc-1.22.1/debian/control	2019-08-27 02:04:33.000000000 +0000
@@ -1,5 +1,6 @@
 Source: golang-google-grpc
-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: Dmitry Smirnov <onlyjob@debian.org>,
            Martín Ferrari <tincho@debian.org>,
            Tim Potter <tpot@hpe.com>,
diff -Nru golang-google-grpc-1.22.1/debian/patches/0001-credentials-alts-Assume-not-running-on-GCP-if-DMI-no.patch golang-google-grpc-1.22.1/debian/patches/0001-credentials-alts-Assume-not-running-on-GCP-if-DMI-no.patch
--- golang-google-grpc-1.22.1/debian/patches/0001-credentials-alts-Assume-not-running-on-GCP-if-DMI-no.patch	1970-01-01 00:00:00.000000000 +0000
+++ golang-google-grpc-1.22.1/debian/patches/0001-credentials-alts-Assume-not-running-on-GCP-if-DMI-no.patch	2019-08-27 02:04:33.000000000 +0000
@@ -0,0 +1,102 @@
+From d5a36f00e624a524866a651b9ed3e21282271e98 Mon Sep 17 00:00:00 2001
+From: Michael Hudson-Doyle <michael.hudson@canonical.com>
+Date: Tue, 27 Aug 2019 12:06:13 +1200
+Subject: [PATCH] credentials/alts: Assume not running on GCP if DMI not
+ present (#2996)
+
+fixes #2995
+---
+ credentials/alts/utils.go      |  3 +++
+ credentials/alts/utils_test.go | 47 ++++++++++++++++++++++++----------
+ 2 files changed, 37 insertions(+), 13 deletions(-)
+
+diff --git a/credentials/alts/utils.go b/credentials/alts/utils.go
+index 4ed27c60..f13aeef1 100644
+--- a/credentials/alts/utils.go
++++ b/credentials/alts/utils.go
+@@ -83,6 +83,9 @@ var (
+ // running on GCP.
+ func isRunningOnGCP() bool {
+ 	manufacturer, err := readManufacturer()
++	if os.IsNotExist(err) {
++		return false
++	}
+ 	if err != nil {
+ 		log.Fatalf("failure to read manufacturer information: %v", err)
+ 	}
+diff --git a/credentials/alts/utils_test.go b/credentials/alts/utils_test.go
+index 3c7e43db..8935c5fb 100644
+--- a/credentials/alts/utils_test.go
++++ b/credentials/alts/utils_test.go
+@@ -21,6 +21,7 @@ package alts
+ import (
+ 	"context"
+ 	"io"
++	"os"
+ 	"strings"
+ 	"testing"
+ 
+@@ -28,6 +29,34 @@ import (
+ 	"google.golang.org/grpc/peer"
+ )
+ 
++func setupManufacturerReader(testOS string, reader func() (io.Reader, error)) func() {
++	tmpOS := runningOS
++	tmpReader := manufacturerReader
++
++	// Set test OS and reader function.
++	runningOS = testOS
++	manufacturerReader = reader
++	return func() {
++		runningOS = tmpOS
++		manufacturerReader = tmpReader
++	}
++
++}
++
++func setup(testOS string, testReader io.Reader) func() {
++	reader := func() (io.Reader, error) {
++		return testReader, nil
++	}
++	return setupManufacturerReader(testOS, reader)
++}
++
++func setupError(testOS string, err error) func() {
++	reader := func() (io.Reader, error) {
++		return nil, err
++	}
++	return setupManufacturerReader(testOS, reader)
++}
++
+ func TestIsRunningOnGCP(t *testing.T) {
+ 	for _, tc := range []struct {
+ 		description string
+@@ -53,20 +82,12 @@ func TestIsRunningOnGCP(t *testing.T) {
+ 	}
+ }
+ 
+-func setup(testOS string, testReader io.Reader) func() {
+-	tmpOS := runningOS
+-	tmpReader := manufacturerReader
+-
+-	// Set test OS and reader function.
+-	runningOS = testOS
+-	manufacturerReader = func() (io.Reader, error) {
+-		return testReader, nil
+-	}
+-
+-	return func() {
+-		runningOS = tmpOS
+-		manufacturerReader = tmpReader
++func TestIsRunningOnGCPNoProductNameFile(t *testing.T) {
++	reverseFunc := setupError("linux", os.ErrNotExist)
++	if isRunningOnGCP() {
++		t.Errorf("ErrNotExist: isRunningOnGCP()=true, want false")
+ 	}
++	reverseFunc()
+ }
+ 
+ func TestAuthInfoFromContext(t *testing.T) {
+-- 
+2.17.1
+
diff -Nru golang-google-grpc-1.22.1/debian/patches/series golang-google-grpc-1.22.1/debian/patches/series
--- golang-google-grpc-1.22.1/debian/patches/series	2019-08-01 14:59:11.000000000 +0000
+++ golang-google-grpc-1.22.1/debian/patches/series	2019-08-27 02:04:33.000000000 +0000
@@ -1 +1,2 @@
+0001-credentials-alts-Assume-not-running-on-GCP-if-DMI-no.patch
 01-Add-NewContext-and-FromContext-back-to-metadata-pack.patch