diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index f689ec44..d53414da 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -53,6 +53,12 @@ LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
     vendor/widevine/libwvdrmengine/third_party/stringencoders/src
 
+# Until level 1 is working on walleye/taimen we've been asked to disable it for dogfooding
+ifeq (,$(filter-out  aosp_walleye% walleye% aosp_taimen% taimen%, $(TARGET_PRODUCT)))
+LOCAL_CFLAGS := -DDISABLE_OEMCRYPTO_LEVEL_1
+endif
+
+
 SRC_DIR := cdm/src
 CORE_SRC_DIR := cdm/core/src
 LOCAL_SRC_FILES := \
diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp
index b0356485..bcd48ca7 100644
--- a/libwvdrmengine/cdm/src/properties_android.cpp
+++ b/libwvdrmengine/cdm/src/properties_android.cpp
@@ -147,7 +147,11 @@ bool Properties::GetOEMCryptoPath(std::string* library_name) {
     LOGW("Properties::GetOEMCryptoPath: Invalid parameter");
     return false;
   }
+#ifdef DISABLE_OEMCRYPTO_LEVEL_1
+#warning !!!! OEMCRYPTO LEVEL 1 IS DISABLED!!!
+#else
   *library_name = "liboemcrypto.so";
+#endif
   return true;
 }