diff --git a/BoardConfig.mk b/BoardConfig.mk
index 475026b..36354d1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -111,3 +111,5 @@ COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
 
 # Call headers from msm-3.0: needed to build libs in hardware/qcom/display
 TARGET_SPECIFIC_HEADER_PATH := device/htc/leo/include
+
+TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/usb_mass_storage/lun0/file
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 3b44ce0..090bccc 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -181,4 +181,9 @@
 
     <!-- Enable use of power animations -->
     <bool name="config_animateScreenLights">false</bool>
+
+    <!-- Use legacy USB device manager. -->
+    <!-- Will uncomment this once the code is in CM
+    <bool name="config_usesLegacyUsbDeviceManager">false</bool> -->
+
 </resources>