diff --git a/Android.bp b/Android.bp
index 7af73b4..0da8987 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3905,6 +3905,165 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "com.qti.feature2.generic",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/com.qti.feature2.generic.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "com.qti.chi.override",
+                "com.qti.feature2.gs",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "libz",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "com.qti.feature2.gs",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/com.qti.feature2.gs.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "com.qti.chi.override",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "libz",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "com.qti.feature2.mfsr",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/com.qti.feature2.mfsr.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "com.qti.chi.override",
+                "com.qti.feature2.gs",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "libz",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "com.qti.feature2.rt",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/com.qti.feature2.rt.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "com.qti.chi.override",
+                "com.qti.feature2.gs",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "libz",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "com.qualcomm.qti.dpm.api@1.0_vendor",
     stem: "com.qualcomm.qti.dpm.api@1.0",
@@ -4268,6 +4427,45 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "com.qti.chi.override",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/com.qti.chi.override.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "vendor.qti.hardware.camera.postproc@1.0-service-impl",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.qti.esepowermanager@1.1-impl",
     owner: "xiaomi",
@@ -5246,6 +5444,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libSNPE",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libSNPE.so",
+            ],
+            shared_libs: [
+                "libdl",
+                "liblog",
+                "libc++_shared",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libSecureUILib",
     owner: "xiaomi",
@@ -5351,6 +5574,37 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libarcsat",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libarcsat.so",
+            ],
+            shared_libs: [
+                "libcamera_metadata",
+                "libcom.qti.chinodeutils",
+                "libtriplecam_video_optical_zoom",
+                "libcutils",
+                "libmpbase",
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libasn1cper",
     owner: "xiaomi",
@@ -5454,6 +5708,28 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libc++_shared",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libc++_shared.so",
+            ],
+            shared_libs: [
+                "libc",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libcacertclient",
     owner: "xiaomi",
@@ -5592,6 +5868,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libchilog",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libchilog.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libsync",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libcne",
     owner: "xiaomi",
@@ -5734,6 +6037,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libcom.qti.chinodeutils",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libcom.qti.chinodeutils.so",
+            ],
+            shared_libs: [
+                "libcamera_metadata",
+                "libchilog",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libconfigdb",
     owner: "xiaomi",
@@ -6834,6 +7164,27 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmpbase",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmpbase.so",
+            ],
+            shared_libs: [
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libnetmgr",
     owner: "xiaomi",
@@ -7024,6 +7375,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libofflinelog",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libofflinelog.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libsync",
+                "libz",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libops",
     owner: "xiaomi",
@@ -8404,6 +8783,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsupermoon",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsupermoon.so",
+            ],
+            shared_libs: [
+                "libSNPE",
+                "libc++_shared",
+                "libc",
+                "libm",
+                "libdl",
+                "libz",
+                "liblog",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsystem_health_mon",
     owner: "xiaomi",
@@ -13376,6 +13782,51 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "f2player",
+    owner: "xiaomi",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/f2player",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "com.qti.feature2.gs",
+                "com.qti.feature2.generic",
+                "com.qti.feature2.mfsr",
+                "com.qti.feature2.rt",
+                "libcamera_metadata",
+                "libchilog",
+                "libhardware",
+                "libhidlbase",
+                "libhidltransport",
+                "libqdMetaData",
+                "libutils",
+                "libui",
+                "vendor.qti.hardware.vpp@1.1",
+                "vendor.qti.hardware.vpp@1.2",
+                "vendor.qti.hardware.camera.postproc@1.0-service-impl",
+                "libxml",
+                "libz",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "feature_enabler_client",
     owner: "xiaomi",
diff --git a/proprietary/vendor/bin/f2player b/proprietary/vendor/bin/f2player
new file mode 100755
index 0000000..ee80e24
Binary files /dev/null and b/proprietary/vendor/bin/f2player differ
diff --git a/proprietary/vendor/lib64/com.qti.feature2.generic.so b/proprietary/vendor/lib64/com.qti.feature2.generic.so
new file mode 100644
index 0000000..397ff10
Binary files /dev/null and b/proprietary/vendor/lib64/com.qti.feature2.generic.so differ
diff --git a/proprietary/vendor/lib64/com.qti.feature2.gs.so b/proprietary/vendor/lib64/com.qti.feature2.gs.so
new file mode 100644
index 0000000..2ccedcd
Binary files /dev/null and b/proprietary/vendor/lib64/com.qti.feature2.gs.so differ
diff --git a/proprietary/vendor/lib64/com.qti.feature2.mfsr.so b/proprietary/vendor/lib64/com.qti.feature2.mfsr.so
new file mode 100644
index 0000000..71dbec2
Binary files /dev/null and b/proprietary/vendor/lib64/com.qti.feature2.mfsr.so differ
diff --git a/proprietary/vendor/lib64/com.qti.feature2.rt.so b/proprietary/vendor/lib64/com.qti.feature2.rt.so
new file mode 100644
index 0000000..793a598
Binary files /dev/null and b/proprietary/vendor/lib64/com.qti.feature2.rt.so differ
diff --git a/proprietary/vendor/lib64/hw/com.qti.chi.override.so b/proprietary/vendor/lib64/hw/com.qti.chi.override.so
new file mode 100644
index 0000000..a8b1f94
Binary files /dev/null and b/proprietary/vendor/lib64/hw/com.qti.chi.override.so differ
diff --git a/proprietary/vendor/lib64/libSNPE.so b/proprietary/vendor/lib64/libSNPE.so
new file mode 100644
index 0000000..4463f4b
Binary files /dev/null and b/proprietary/vendor/lib64/libSNPE.so differ
diff --git a/proprietary/vendor/lib64/libarcsat.so b/proprietary/vendor/lib64/libarcsat.so
new file mode 100644
index 0000000..a601aed
Binary files /dev/null and b/proprietary/vendor/lib64/libarcsat.so differ
diff --git a/proprietary/vendor/lib64/libc++_shared.so b/proprietary/vendor/lib64/libc++_shared.so
new file mode 100644
index 0000000..d07d15a
Binary files /dev/null and b/proprietary/vendor/lib64/libc++_shared.so differ
diff --git a/proprietary/vendor/lib64/libchilog.so b/proprietary/vendor/lib64/libchilog.so
new file mode 100644
index 0000000..be47364
Binary files /dev/null and b/proprietary/vendor/lib64/libchilog.so differ
diff --git a/proprietary/vendor/lib64/libcom.qti.chinodeutils.so b/proprietary/vendor/lib64/libcom.qti.chinodeutils.so
new file mode 100644
index 0000000..28ba409
Binary files /dev/null and b/proprietary/vendor/lib64/libcom.qti.chinodeutils.so differ
diff --git a/proprietary/vendor/lib64/libmpbase.so b/proprietary/vendor/lib64/libmpbase.so
new file mode 100644
index 0000000..9561793
Binary files /dev/null and b/proprietary/vendor/lib64/libmpbase.so differ
diff --git a/proprietary/vendor/lib64/libofflinelog.so b/proprietary/vendor/lib64/libofflinelog.so
new file mode 100644
index 0000000..949b3de
Binary files /dev/null and b/proprietary/vendor/lib64/libofflinelog.so differ
diff --git a/proprietary/vendor/lib64/libsupermoon.so b/proprietary/vendor/lib64/libsupermoon.so
new file mode 100644
index 0000000..4018f85
Binary files /dev/null and b/proprietary/vendor/lib64/libsupermoon.so differ
diff --git a/sm8250-common-vendor.mk b/sm8250-common-vendor.mk
index d67638b..a57ccca 100644
--- a/sm8250-common-vendor.mk
+++ b/sm8250-common-vendor.mk
@@ -248,6 +248,10 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.wifidisplaysession@1.0_vendor \
     vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \
     android.hardware.secure_element@1.0-impl \
+    com.qti.feature2.generic \
+    com.qti.feature2.gs \
+    com.qti.feature2.mfsr \
+    com.qti.feature2.rt \
     com.qualcomm.qti.dpm.api@1.0_vendor \
     com.qualcomm.qti.imscmservice@1.0 \
     com.qualcomm.qti.imscmservice@2.0 \
@@ -260,6 +264,7 @@ PRODUCT_PACKAGES += \
     deviceInfoServiceModule \
     android.hardware.bluetooth@1.0-impl-qti \
     android.hardware.gatekeeper@1.0-impl-qti \
+    com.qti.chi.override \
     vendor.qti.esepowermanager@1.1-impl \
     vendor.qti.hardware.alarm@1.0-impl \
     vendor.qti.hardware.bluetooth_sar@1.1-impl \
@@ -290,23 +295,28 @@ PRODUCT_PACKAGES += \
     libQSEEComAPI \
     libQTEEConnector_listener \
     libQTEEConnector_vendor \
+    libSNPE \
     libSecureUILib \
     libStDrvInt \
     libadsp_default_listener \
     libaoa \
+    libarcsat \
     libasn1cper \
     libasn1crt \
     libasn1crtx \
     libbtnv \
+    libc++_shared \
     libcacertclient \
     libcdfw \
     libcdfw_remote_api \
     libcdsp_default_listener \
     libcdsprpc_system \
+    libchilog \
     libcne \
     libcneapiclient \
     libcneoplookup \
     libcneqmiutils \
+    libcom.qti.chinodeutils \
     libconfigdb \
     libcpion \
     libdataitems \
@@ -345,12 +355,14 @@ PRODUCT_PACKAGES += \
     libminkdescriptor \
     libminksocket \
     libmodemapi \
+    libmpbase \
     libnetmgr \
     libnetmgr_common \
     libnetmgr_nr_fusion \
     libnetmgr_rmnet_ext \
     libnlnetmgr \
     liboemcrypto \
+    libofflinelog \
     libops \
     libpdmapper \
     libpdnotifier \
@@ -397,6 +409,7 @@ PRODUCT_PACKAGES += \
     libspcom \
     libspl \
     libssd \
+    libsupermoon \
     libsystem_health_mon \
     libtime_genoff \
     libtinyxml2_1 \
@@ -573,6 +586,7 @@ PRODUCT_PACKAGES += \
     cnss-daemon \
     dpmQmiMgr \
     dspservice \
+    f2player \
     feature_enabler_client \
     android.hardware.bluetooth@1.0-service-qti \
     android.hardware.drm@1.3-service.widevine \