diff --git a/libwvdrmengine/cdm/core/include/properties.h b/libwvdrmengine/cdm/core/include/properties.h
index 8bc838ed..b7af2f70 100644
--- a/libwvdrmengine/cdm/core/include/properties.h
+++ b/libwvdrmengine/cdm/core/include/properties.h
@@ -39,6 +39,7 @@ class Properties {
   static inline bool use_certificates_as_identification() {
     return use_certificates_as_identification_;
   }
+  static bool GetCompanyName(std::string& company_name);
   static bool GetModelName(std::string& model_name);
   static bool GetArchitectureName(std::string& arch_name);
   static bool GetDeviceName(std::string& device_name);
diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp
index cf4f8520..893d916f 100644
--- a/libwvdrmengine/cdm/core/src/license.cpp
+++ b/libwvdrmengine/cdm/core/src/license.cpp
@@ -14,7 +14,6 @@
 
 namespace {
   std::string kCompanyNameKey = "company_name";
-  std::string kCompanyNameValueGoogle = "Google";
   std::string kModelNameKey = "model_name";
   std::string kArchitectureNameKey = "architecture_name";
   std::string kDeviceNameKey = "device_name";
@@ -136,9 +135,11 @@ bool CdmLicense::PrepareKeyRequest(const CdmInitData& init_data,
     client_info->set_value(iter->second);
   }
   std::string value;
-  client_info = client_id->add_client_info();
-  client_info->set_name(kCompanyNameKey);
-  client_info->set_value(kCompanyNameValueGoogle);
+  if (Properties::GetCompanyName(value)) {
+    client_info = client_id->add_client_info();
+    client_info->set_name(kCompanyNameKey);
+    client_info->set_value(value);
+  }
   if (Properties::GetModelName(value)) {
     client_info = client_id->add_client_info();
     client_info->set_name(kModelNameKey);
diff --git a/libwvdrmengine/cdm/src/properties.cpp b/libwvdrmengine/cdm/src/properties.cpp
index 5489decb..80f44a3b 100644
--- a/libwvdrmengine/cdm/src/properties.cpp
+++ b/libwvdrmengine/cdm/src/properties.cpp
@@ -19,6 +19,10 @@ namespace {
 
 namespace wvcdm {
 
+bool Properties::GetCompanyName(std::string& company_name) {
+  return GetAndroidProperty("ro.product.manufacturer", company_name);
+}
+
 bool Properties::GetModelName(std::string& model_name) {
   return GetAndroidProperty("ro.product.model", model_name);
 }