diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp
index 67cea885..15b25bee 100644
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -372,7 +372,7 @@ CdmResponseType CdmSession::GenerateKeyRequest(
            init_data.type().c_str());
       return UNSUPPORTED_INIT_DATA;
     }
-    if (init_data.IsEmpty()) {
+    if (init_data.IsEmpty() && !license_parser_->HasInitData()) {
       LOGW("CdmSession::GenerateKeyRequest: init data absent");
       return INIT_DATA_NOT_FOUND;
     }
diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp
index 84543e7c..1a84e64f 100644
--- a/libwvdrmengine/cdm/src/properties_android.cpp
+++ b/libwvdrmengine/cdm/src/properties_android.cpp
@@ -19,7 +19,7 @@ const char kL2Dir[] = "/L2/";
 const char kL3Dir[] = "/L3/";
 const char kFactoryKeyboxPath[] = "/factory/wv.keys";
 
-const char kWVCdmVersion[] = "v5.1.0-android";
+const char kWVCdmVersion[] = "v6.0.0-android";
 
 bool GetAndroidProperty(const char* key, std::string* value) {
   char val[PROPERTY_VALUE_MAX];
diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp
index 270c5e0a..3813ff60 100644
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -1639,7 +1639,10 @@ TEST_F(WvCdmRequestLicenseTest, PrivacyModeTest) {
   std::string resp = GetKeyRequestResponse(g_license_server, g_client_auth);
   EXPECT_EQ(decryptor_.AddKey(session_id_, resp, &key_set_id_),
             wvcdm::NEED_KEY);
-  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
+  const std::string empty_init_data;
+  // Verify cached initialization data from previous request is used when
+  // empty initialization data is passed.
+  GenerateKeyRequest(empty_init_data, kLicenseTypeStreaming);
   VerifyKeyRequestResponse(g_license_server, g_client_auth);
   decryptor_.CloseSession(session_id_);
 }
@@ -3545,14 +3548,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
   char release_number[PROPERTY_VALUE_MAX];
   ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
             0);
-  EXPECT_STREQ("8.1.0", release_number)
+  EXPECT_STREQ("P", release_number)
       << "The Android version number has changed. You need to update this test "
          "and also possibly update the Widevine version number in "
          "properties_android.cpp.";
 
   std::string widevine_version;
   ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
-  EXPECT_EQ("v5.1.0-android", widevine_version)
+  EXPECT_EQ("v6.0.0-android", widevine_version)
       << "The Widevine CDM version number has changed. Did you forget to "
          "update this test after changing it?";
 }
diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
index aea51dcf..169e7949 100644
--- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
@@ -923,14 +923,14 @@ void WVDrmPlugin::OnExpirationUpdate(const CdmSessionId& cdmSessionId,
 
 status_t WVDrmPlugin::queryProperty(const std::string& property,
                                     std::string& stringValue) const {
-  SecurityLevel securityLevel =
+    wvcdm::SecurityLevel securityLevel =
       mPropertySet.security_level().compare(QUERY_VALUE_SECURITY_LEVEL_L3) == 0
           ? kLevel3
           : kLevelDefault;
   return queryProperty(securityLevel, property, stringValue);
 }
 
-status_t WVDrmPlugin::queryProperty(SecurityLevel securityLevel,
+status_t WVDrmPlugin::queryProperty(wvcdm::SecurityLevel securityLevel,
                                     const std::string& property,
                                     std::string& stringValue) const {
   CdmResponseType res =