diff --git a/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/IMediaDrmBridge.aidl b/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/IMediaDrmBridge.aidl
index 515e4b7d0892..f5f5e06b0877 100644
--- a/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/IMediaDrmBridge.aidl
+++ b/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/IMediaDrmBridge.aidl
@@ -22,4 +22,6 @@ interface IMediaDrmBridge {
     oneway void closeSession(int promiseId, String sessionId);
 
     oneway void release();
+
+    void setServerCertificate(in byte[] cert);
 }
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrm.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrm.java
index 7b3bda3fd72d..e8f285bfcd91 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrm.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrm.java
@@ -32,4 +32,5 @@ public interface GeckoMediaDrm {
     void closeSession(int promiseId, String sessionId);
     void release();
     MediaCrypto getMediaCrypto();
+    void setServerCertificate(final byte[] cert);
 }
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
index de07b40ffd20..05e1b6eca786 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
@@ -301,6 +301,16 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm {
         return mCrypto;
     }
 
+    @Override
+    public void setServerCertificate(final byte[] cert) {
+        if (DEBUG) Log.d(LOGTAG, "setServerCertificate()");
+        if (mDrm == null) {
+            throw new IllegalStateException("MediaDrm instance doesn't exist !!");
+        }
+        mDrm.setPropertyByteArray("serviceCertificate", cert);
+        return;
+    }
+
     protected void HandleKeyStatusChangeByDummyKey(String sessionId)
     {
         SessionKeyInfo[] keyInfos = new SessionKeyInfo[1];
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridge.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridge.java
index 7fa8db3fcfca..784e13c527ef 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridge.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridge.java
@@ -150,4 +150,15 @@ final class RemoteMediaDrmBridge implements GeckoMediaDrm {
         assertTrue(false);
         return null;
     }
-}
\ No newline at end of file
+
+    @Override
+    public synchronized void setServerCertificate(final byte[] cert) {
+        try {
+            mRemote.setServerCertificate(cert);
+        } catch (Exception e) {
+            Log.e(LOGTAG, "Got exception while setting server certificate.", e);
+            throw new RuntimeException(e);
+        }
+    }
+}
+
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridgeStub.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridgeStub.java
index 190280e86404..0d414f23c104 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridgeStub.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/RemoteMediaDrmBridgeStub.java
@@ -243,4 +243,14 @@ final class RemoteMediaDrmBridgeStub extends IMediaDrmBridge.Stub implements IBi
         mCallbacks = null;
         mStubId = "";
     }
+
+    @Override
+    public synchronized void setServerCertificate(final byte[] cert) {
+        try {
+            mBridge.setServerCertificate(cert);
+        } catch (IllegalStateException e) {
+            Log.e(LOGTAG, "Failed to setServerCertificate.", e);
+            throw e;
+        }
+    }
 }