diff --git a/Android.bp b/Android.bp
index db1b244..f3e6b4f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18196,3 +18196,89 @@ install_symlink {
     installed_location: "lib64/libq3dtools_adreno.so",
     symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
 }
+
+cc_prebuilt_library_shared {
+    name: "fm_helium",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/fm_helium.so",
+            ],
+            shared_libs: [
+                "libfm-hci",
+                "liblog",
+                "libnativehelper",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libfm-hci",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libfm-hci.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libbase",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "vendor.qti.hardware.fm@1.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.fm@1.0",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
diff --git a/proprietary/system_ext/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so
new file mode 100644
index 0000000..7aa74bd
Binary files /dev/null and b/proprietary/system_ext/lib64/fm_helium.so differ
diff --git a/proprietary/system_ext/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so
new file mode 100644
index 0000000..4197cfa
Binary files /dev/null and b/proprietary/system_ext/lib64/libfm-hci.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so
new file mode 100644
index 0000000..739da33
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index 3be4cc3..f4cfc24 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -919,3 +919,12 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += \
     WfdCommon
+
+ifeq ($(TARGET_HAS_FM),true)
+
+PRODUCT_PACKAGES += \
+    fm_helium \
+    libfm-hci \
+    vendor.qti.hardware.fm@1.0
+
+endif