diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp
index 41cb2d22..9a698f77 100644
--- a/libwvdrmengine/cdm/core/src/license.cpp
+++ b/libwvdrmengine/cdm/core/src/license.cpp
@@ -288,7 +288,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
   if (session_->UsageInformationSupport(&supports_usage_information)) {
 #if 1 // Temporary workaround for b/16994418
     std::string value;
-    if (Properties::GetModelName(&value) && value == "ADT-1") {
+    if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
       supports_usage_information = false;
     }
 #endif
@@ -337,7 +337,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
 #if 1 // Temporary workaround for b/16994418
     std::string value;
     bool set_api_version = true;
-    if (Properties::GetModelName(&value) && value == "ADT-1") {
+    if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
       set_api_version = false;
     }
     if (set_api_version) {