diff --git a/BoardConfig.mk b/BoardConfig.mk
index b502a35b..f274d6b6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -129,6 +129,7 @@ AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
 AUDIO_FEATURE_ENABLED_SND_MONITOR := true
 AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
 BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
+AUDIO_FEATURE_ENABLED_MAXX_AUDIO := true
 
 # Include whaoo modules
 USES_DEVICE_GOOGLE_WAHOO := true
diff --git a/device.mk b/device.mk
index 9ea22039..9c03ce3a 100755
--- a/device.mk
+++ b/device.mk
@@ -481,7 +481,8 @@ PRODUCT_PACKAGES += \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libqcomvoiceprocessingdescriptors \
-    libqcompostprocbundle
+    libqcompostprocbundle \
+    libmalistener
 
 PRODUCT_PACKAGES += \
     audio.primary.msm8998 \
diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index 603afbba..66ac85e5 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -30,7 +30,7 @@ constexpr int BUFFER_SIZE = 512;
 constexpr int MAX_FILE_PATH_LENGTH = 256;
 constexpr int EPOLL_EVENTS = 10;
 constexpr bool DEBUG = false;
-constexpr int DISCONNECT_WAIT_US = 10000;
+constexpr int DISCONNECT_WAIT_US = 100000;
 
 #define BUILD_TYPE "ro.build.type"
 #define GADGET_PATH "/config/usb_gadget/g1/"