diff --git a/libwvdrmengine/cdm/core/include/log.h b/libwvdrmengine/cdm/core/include/log.h
index d7a0a593..d03ef873 100644
--- a/libwvdrmengine/cdm/core/include/log.h
+++ b/libwvdrmengine/cdm/core/include/log.h
@@ -23,7 +23,7 @@ extern LogPriority g_cutoff;
 // This function is supplied for cases where the system layer does not
 // initialize logging.  This is also needed to initialize logging in
 // unit tests.
-void InitLogging(int argc, const char* const* argv);
+void InitLogging();
 
 void Log(const char* file, int line, LogPriority level, const char* fmt, ...);
 
diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp
index bc631d93..8c012036 100644
--- a/libwvdrmengine/cdm/src/log.cpp
+++ b/libwvdrmengine/cdm/src/log.cpp
@@ -22,11 +22,18 @@
 #include "log.h"
 #include <utils/Log.h>
 
+/*
+ * Uncomment the line below if you want to have the LOGV messages to print
+ * IMPORTANT : this will affect all of CDM
+ */
+
+// #define LOG_NDEBUG 0
+
 namespace wvcdm {
 
 LogPriority g_cutoff = LOG_VERBOSE;
 
-void InitLogging(int /* argc */, const char* const* /* argv */) {}
+void InitLogging() {}
 
 void Log(const char* /* file */, int /* line */, LogPriority level,
          const char* fmt, ...) {
diff --git a/libwvdrmengine/third_party/stringencoders/src/config.h b/libwvdrmengine/third_party/stringencoders/src/config.h
new file mode 100644
index 00000000..48630b0f
--- /dev/null
+++ b/libwvdrmengine/third_party/stringencoders/src/config.h
@@ -0,0 +1 @@
+// dummy