diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 586b7e84..d0323cb8 100755
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -410,6 +410,9 @@ bool CryptoSession::GenerateSignature(const std::string& message,
     return false;
   }
 
+  // TODO(fredgc): remove in K, when L1 library reports correct length.
+  signature->resize(length);
+
   return true;
 }
 
@@ -556,6 +559,8 @@ bool CryptoSession::RewrapDeviceRSAKey(const std::string& message,
       reinterpret_cast<uint8_t*>(const_cast<char*>(wrapped_rsa_key->data())),
       &wrapped_rsa_key_length);
 
+  // TODO(fredgc): remove in K, when L1 library reports correct length.
+  wrapped_rsa_key->resize(wrapped_rsa_key_length);
   if (OEMCrypto_SUCCESS != status) {
     LOGE("OEMCrypto_RewrapDeviceRSAKey fails with %d", status);
     return false;
diff --git a/libwvdrmengine/docs/WidevineModularDRMSecurityIntegrationGuideforCENC.pdf b/libwvdrmengine/docs/WidevineModularDRMSecurityIntegrationGuideforCENC.pdf
index a5434ba2..dddf4cce 100644
Binary files a/libwvdrmengine/docs/WidevineModularDRMSecurityIntegrationGuideforCENC.pdf and b/libwvdrmengine/docs/WidevineModularDRMSecurityIntegrationGuideforCENC.pdf differ