diff --git a/Android.bp b/Android.bp
index 957ae0b..3940297 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9557,14 +9557,15 @@ cc_prebuilt_library_shared {
                 "libandroid_runtime",
                 "libui",
                 "libinput",
-                "libbinder",
-                "libgui",
                 "libnativehelper",
                 "libutils",
                 "liblog",
                 "libwfdclient",
                 "libhidlbase",
                 "libhidlmemory",
+                "libbinder",
+                "libgui",
+                "android.hidl.base@1.0",
                 "android.hidl.token@1.0-utils",
                 "android.hardware.graphics.common@1.0",
                 "android.hardware.graphics.bufferqueue@1.0",
@@ -9742,6 +9743,8 @@ cc_prebuilt_library_shared {
                 "libmmosal",
                 "libutils",
                 "liblog",
+                "libcutils",
+                "libwfdconfigutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -11601,15 +11604,14 @@ cc_prebuilt_binary {
 }
 
 cc_prebuilt_binary {
-    name: "wfdservice64",
+    name: "wfdservice",
     owner: "xiaomi",
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/system_ext/bin/wfdservice64",
+                "proprietary/system_ext/bin/wfdservice",
             ],
             shared_libs: [
-                "libwfdservice_shim",
                 "liblog",
                 "libutils",
                 "libcutils",
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
index b9eac0c..61a53cf 100644
Binary files a/proprietary/system/framework/WfdCommon.jar and b/proprietary/system/framework/WfdCommon.jar differ
diff --git a/proprietary/system_ext/bin/wfdservice64 b/proprietary/system_ext/bin/wfdservice
similarity index 59%
rename from proprietary/system_ext/bin/wfdservice64
rename to proprietary/system_ext/bin/wfdservice
index 17246de..e8f7d1d 100755
Binary files a/proprietary/system_ext/bin/wfdservice64 and b/proprietary/system_ext/bin/wfdservice differ
diff --git a/proprietary/system_ext/etc/init/wfdservice.rc b/proprietary/system_ext/etc/init/wfdservice.rc
index 16d075e..a11d7c2 100644
--- a/proprietary/system_ext/etc/init/wfdservice.rc
+++ b/proprietary/system_ext/etc/init/wfdservice.rc
@@ -16,13 +16,13 @@ service wfdservice64 /system_ext/bin/wfdservice64
     oneshot
 
 on property:vendor.wfdservice=enable
-    start wfdservice64
+    start wfdservice
 
 on property:vendor.wfdservice64=enable
     start wfdservice64
 
 on property:vendor.wfdservice=disable
-    stop wfdservice64
+    stop wfdservice
 
 on property:vendor.wfdservice64=disable
     stop wfdservice64
diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
index 45f64ae..98b3c11 100644
--- a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
+++ b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
@@ -84,6 +84,3 @@ epoll_create1: 1
 epoll_ctl: 1
 recvfrom: 1
 epoll_pwait: 1
-umask: 1
-ioprio_set: 1
-wait4: 1
\ No newline at end of file
diff --git a/proprietary/system_ext/etc/wfdconfigsink.xml b/proprietary/system_ext/etc/wfdconfigsink.xml
index 6f5a2af..e792b1d 100644
--- a/proprietary/system_ext/etc/wfdconfigsink.xml
+++ b/proprietary/system_ext/etc/wfdconfigsink.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
     <!--
-        Copyright (C) 2012 - 2021 Qualcomm Technologies, Inc.
+        Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
         All Rights Reserved.
         Confidential and Proprietary - Qualcomm Technologies, Inc.
     -->
@@ -278,9 +278,20 @@
                     <Wifi>0</Wifi>
                     <NoSP>0</NoSP>
                 </HIDInputPaths>
+                <!--  Supported HIDC input events  -->
+                <CustomHIDCInputPaths>
+                    <Infrared>0</Infrared>
+                    <USB>3</USB>
+                    <BT>0</BT>
+                    <Zigbee>0</Zigbee>
+                    <Wifi>0</Wifi>
+                    <NoSP>0</NoSP>
+                </CustomHIDCInputPaths>
             </InputEvents>
             <!--  TCP port on which UIBC connection established -->
             <TcpPort>4321</TcpPort>
+            <!-- 0/1 - support Custome HIDC or not -->
+            <CustomAppUIBCSupport>0</CustomAppUIBCSupport>
         </UIBC>
     </Capability>
 
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
index 9cdb25c..3213a0a 100644
Binary files a/proprietary/system_ext/lib64/libmmosal.so and b/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so
index 81f3b3b..7f9e0e1 100644
Binary files a/proprietary/system_ext/lib64/libmmparser_lite.so and b/proprietary/system_ext/lib64/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
index 66bf346..43dd0d5 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpdecoder.so and b/proprietary/system_ext/lib64/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so
index 472c276..092844b 100644
Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.so and b/proprietary/system_ext/lib64/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib64/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so
index 5470444..aaf59a0 100644
Binary files a/proprietary/system_ext/lib64/libwfdavenhancements.so and b/proprietary/system_ext/lib64/libwfdavenhancements.so differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
index 38be461..a7020fc 100644
Binary files a/proprietary/system_ext/lib64/libwfdclient.so and b/proprietary/system_ext/lib64/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so
index ec5d62b..8eafa81 100644
Binary files a/proprietary/system_ext/lib64/libwfdcommonutils.so and b/proprietary/system_ext/lib64/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so
index 4edad98..f6f69fa 100644
Binary files a/proprietary/system_ext/lib64/libwfdconfigutils.so and b/proprietary/system_ext/lib64/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so
index fd05c54..2f40cc8 100644
Binary files a/proprietary/system_ext/lib64/libwfddisplayconfig.so and b/proprietary/system_ext/lib64/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so
index 99f4a1d..8e3110e 100644
Binary files a/proprietary/system_ext/lib64/libwfdmminterface.so and b/proprietary/system_ext/lib64/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so
index 4e783bf..4b182cd 100644
Binary files a/proprietary/system_ext/lib64/libwfdmmsink.so and b/proprietary/system_ext/lib64/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so
index ed6bce1..1ea216f 100644
Binary files a/proprietary/system_ext/lib64/libwfdmmsrc_system.so and b/proprietary/system_ext/lib64/libwfdmmsrc_system.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
index 377665d..119867e 100644
Binary files a/proprietary/system_ext/lib64/libwfdnative.so and b/proprietary/system_ext/lib64/libwfdnative.so differ
diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so
index c7d5f52..e472f56 100644
Binary files a/proprietary/system_ext/lib64/libwfdrtsp.so and b/proprietary/system_ext/lib64/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib64/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so
index a069111..127a227 100644
Binary files a/proprietary/system_ext/lib64/libwfdservice.so and b/proprietary/system_ext/lib64/libwfdservice.so differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
index 457bc42..f50a531 100644
Binary files a/proprietary/system_ext/lib64/libwfdsinksm.so and b/proprietary/system_ext/lib64/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so
index b581be3..4f810e7 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcinterface.so and b/proprietary/system_ext/lib64/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so
index a58c662..8b0b41b 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsink.so and b/proprietary/system_ext/lib64/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so
index 1f5d63a..91decf7 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so
index 37582df..1989161 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrc.so and b/proprietary/system_ext/lib64/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so
index a5515f4..33e3eb0 100644
Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
index 2e5cbb0..c04e005 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
index 44ed720..bc46c96 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
index 9af9f99..5c3ce6b 100644
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ
diff --git a/sm6150-common-vendor.mk b/sm6150-common-vendor.mk
index 05c60bf..a3ea079 100644
--- a/sm6150-common-vendor.mk
+++ b/sm6150-common-vendor.mk
@@ -490,7 +490,7 @@ PRODUCT_PACKAGES += \
     wifidisplayhalservice \
     xtra-daemon \
     dpmd \
-    wfdservice64
+    wfdservice
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \