diff --git a/libwvdrmengine/cdm/core/src/device_files.cpp b/libwvdrmengine/cdm/core/src/device_files.cpp
index 9791e604..dd6b4c05 100644
--- a/libwvdrmengine/cdm/core/src/device_files.cpp
+++ b/libwvdrmengine/cdm/core/src/device_files.cpp
@@ -14,9 +14,9 @@
 namespace wvcdm {
 
 // TODO(rfrias): Make this work for non-unix paths
-const char* DeviceFiles::kBasePath = "/data/drm";
-const char* DeviceFiles::kIdmPath = "/data/drm/IDM";
-const char* DeviceFiles::kCencPath = "/data/drm/IDM/CENC";
+const char* DeviceFiles::kBasePath = "/data/mediadrm";
+const char* DeviceFiles::kIdmPath = "/data/mediadrm/IDM";
+const char* DeviceFiles::kCencPath = "/data/mediadrm/IDM/CENC";
 const char* DeviceFiles::kDeviceCertificateFileName = "cert.bin";
 
 // Protobuf generated classes.
diff --git a/libwvdrmengine/cdm/core/test/file_store_unittest.cpp b/libwvdrmengine/cdm/core/test/file_store_unittest.cpp
index 24649159..0400bed7 100644
--- a/libwvdrmengine/cdm/core/test/file_store_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/file_store_unittest.cpp
@@ -5,11 +5,11 @@
 
 namespace {
   // TODO(rfrias): Make this work for non-unix paths
-  const std::string kDataDrmDir = "/data/drm";
-  const std::string kIdmTestDir = "/data/drm/IDMtest";
-  const std::string kCencTestDir = "/data/drm/IDMtest/CENCtest";
-  const std::string kCencTestDirWithSlash = "/data/drm/IDMtest/CENCtest/";
-  const std::string kTestFile01 = "/data/drm/IDMtest/CENCtest/file01.txt";
+  const std::string kDataDrmDir = "/data/mediadrm";
+  const std::string kIdmTestDir = "/data/mediadrm/IDMtest";
+  const std::string kCencTestDir = "/data/mediadrm/IDMtest/CENCtest";
+  const std::string kCencTestDirWithSlash = "/data/mediadrm/IDMtest/CENCtest/";
+  const std::string kTestFile01 = "/data/mediadrm/IDMtest/CENCtest/file01.txt";
 
   const std::string kFileExists = "/system/bin/sh";
   const std::string kDirExists = "/system/bin";
diff --git a/libwvdrmengine/level3/arm/libwvlevel3.a b/libwvdrmengine/level3/arm/libwvlevel3.a
index 18353b7e..8dcf6942 100644
Binary files a/libwvdrmengine/level3/arm/libwvlevel3.a and b/libwvdrmengine/level3/arm/libwvlevel3.a differ
diff --git a/libwvdrmengine/level3/mips/libwvlevel3.a b/libwvdrmengine/level3/mips/libwvlevel3.a
index 77330e06..cd726b47 100644
Binary files a/libwvdrmengine/level3/mips/libwvlevel3.a and b/libwvdrmengine/level3/mips/libwvlevel3.a differ
diff --git a/libwvdrmengine/level3/x86/libwvlevel3.a b/libwvdrmengine/level3/x86/libwvlevel3.a
index 3ef2a30a..8ea63a57 100644
Binary files a/libwvdrmengine/level3/x86/libwvlevel3.a and b/libwvdrmengine/level3/x86/libwvlevel3.a differ