diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
index ca188362..993f7770 100644
--- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
@@ -151,19 +151,11 @@ status_t WVDrmPlugin::getKeyRequest(
 
   string cdmMimeType = mimeType.string();
 
-  // Provide backwards-compatibility for versions of apps that pass the wrong
-  // MIME type.
-  // TODO(b/13731637) - Remove this.
-  if (cdmMimeType == "") {
-    ALOGW("ALERT: Empty MIME type is supported for backwards-compatibility "
-          "only and may go away in the future. Switch to \"video/mp4\" to "
-          "become compliant.");
-    cdmMimeType = "video/mp4";
-  } else if (cdmMimeType == "video/avc") {
-    ALOGW("ALERT: MIME type \"video/avc\" is supported for backwards-"
-          "compatibility only and may go away in the future. Switch to "
-          "\"video/mp4\" to become compliant.");
-    cdmMimeType = "video/mp4";
+  // Provide backwards-compatibility for apps that pass non-EME-compatible MIME
+  // types.
+  if (cdmMimeType != wvcdm::ISO_BMFF_MIME_TYPE &&
+      cdmMimeType != wvcdm::WEBM_MIME_TYPE) {
+    cdmMimeType = wvcdm::ISO_BMFF_MIME_TYPE;
   }
 
   CdmInitData processedInitData;