diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
index cc9ac0d1..487ee7fc 100644
--- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
+++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
@@ -15,6 +15,8 @@
 
 namespace {
 
+const std::string kKeyBuildInfo = "build_info";
+
 // URL for Google Provisioning Server.
 // The provisioning server supplies the certificate that is needed
 // to communicate with the License Server.
@@ -235,6 +237,15 @@ CdmResponseType CertificateProvisioning::GetProvisioningRequest(
       return CLIENT_IDENTIFICATION_TOKEN_ERROR_2;
     }
     client_id->set_token(token);
+
+    std::string value;
+    if (Properties::GetBuildInfo(&value)) {
+      ClientIdentification_NameValue* client_info;
+
+      client_info = client_id->add_client_info();
+      client_info->set_name(kKeyBuildInfo);
+      client_info->set_value(value);
+    }
   }
 
   uint32_t nonce;
diff --git a/libwvdrmengine/cdm/core/src/client_identification.cpp b/libwvdrmengine/cdm/core/src/client_identification.cpp
index 32d234b6..16755b69 100644
--- a/libwvdrmengine/cdm/core/src/client_identification.cpp
+++ b/libwvdrmengine/cdm/core/src/client_identification.cpp
@@ -133,15 +133,6 @@ CdmResponseType ClientIdentification::Prepare(
     client_info->set_name(kKeyBuildInfo);
     client_info->set_value(value);
   }
-  if (!device_id_.empty()) {
-    client_info = client_id->add_client_info();
-    client_info->set_name(kKeyDeviceId);
-    client_info->set_value(b2a_hex(device_id_));
-  } else if (crypto_session_->GetInternalDeviceUniqueId(&value)) {
-    client_info = client_id->add_client_info();
-    client_info->set_name(kKeyDeviceId);
-    client_info->set_value(value);
-  }
   if (Properties::GetWVCdmVersion(&value)) {
     client_info = client_id->add_client_info();
     client_info->set_name(kKeyWvCdmVersion);