--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -632,22 +632,16 @@ pref("media.android-remote-codec.enabled
 pref("media.android-remote-codec.enabled", false);
 #endif
 
 // Enable MSE
 pref("media.mediasource.enabled", true);
 
 pref("media.mediadrm-widevinecdm.visible", true);
 
-#ifdef NIGHTLY_BUILD
-// Enable EME(Encrypted media extensions)
-pref("media.eme.enabled", true);
-pref("media.eme.apiVisible", true);
-#endif
-
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 
 pref("browser.safebrowsing.downloads.enabled", false);
 
 pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
 
 // True if this is the first time we are showing about:firstrun

--- a/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
@@ -42,18 +42,18 @@ public final class MediaDrmProxy {
     public static final ArrayList<MediaDrmProxy> sProxyList = new ArrayList<MediaDrmProxy>();
 
     // A flag to avoid using the native object that has been destroyed.
     private boolean mDestroyed;
     private GeckoMediaDrm mImpl;
     private String mDrmStubId;
 
     private static boolean isSystemSupported() {
-        // Support versions >= Marshmallow
-        if (AppConstants.Versions.preMarshmallow) {
+        // Support versions >= LOLLIPOP
+        if (AppConstants.Versions.preLollipop) {
             if (DEBUG) Log.d(LOGTAG, "System Not supported !!, current SDK version is " + Build.VERSION.SDK_INT);
             return false;
         }
         return true;
     }
 
     @WrapForJNI
     public static boolean isSchemeSupported(String keySystem) {