diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 934d0e80..e4b6d2f3 100755
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -433,12 +433,10 @@ bool CryptoSession::RefreshKeys(const std::string& message,
 }
 
 bool CryptoSession::SelectKey(const std::string& key_id) {
-  LOGV("CryptoSession::SelectKey: Lock");
   AutoLock auto_lock(crypto_lock_);
   const uint8_t* key_id_string =
       reinterpret_cast<const uint8_t*>(key_id.data());
 
-  LOGV("SelectKey: id=%ld", static_cast<uint32_t>(oec_session_id_));
   OEMCryptoResult sts =
       OEMCrypto_SelectKey(oec_session_id_, key_id_string, key_id.size());
   if (OEMCrypto_SUCCESS != sts) {
diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp
index 0446392a..6b403504 100644
--- a/libwvdrmengine/cdm/src/log.cpp
+++ b/libwvdrmengine/cdm/src/log.cpp
@@ -2,6 +2,20 @@
 //
 // Log - implemented using the standard Android logging mechanism
 
+/*
+ * Qutoing from system/core/include/log/log.h:
+ * Normally we strip ALOGV (VERBOSE messages) from release builds.
+ * You can modify this (for example with "#define LOG_NDEBUG 0"
+ * at the top of your source file) to change that behavior.
+ */
+#ifndef LOG_NDEBUG
+#ifdef NDEBUG
+#define LOG_NDEBUG 1
+#else
+#define LOG_NDEBUG 0
+#endif
+#endif
+
 #define LOG_TAG "WVCdm"
 #define LOG_BUF_SIZE 1024
 
@@ -26,7 +40,11 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...) {
     case LOG_WARN: prio = ANDROID_LOG_WARN; break;
     case LOG_INFO: prio = ANDROID_LOG_INFO; break;
     case LOG_DEBUG: prio = ANDROID_LOG_DEBUG; break;
+#if LOG_NDEBUG
+    case LOG_VERBOSE: return;
+#else
     case LOG_VERBOSE: prio = ANDROID_LOG_VERBOSE; break;
+#endif
   }
 
   __android_log_write(prio, LOG_TAG, buf);