diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index e51b0bf..2b1fd73 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -415,13 +415,13 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <route type="mix" sink="voice_rx"
                        sources="Telephony Rx"/>
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
                 <route type="mix" sink="usb_surround_sound"
                        sources="USB Device In,USB Headset In"/>
                 <route type="mix" sink="fast input"
                        sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Wired Headset Mic"/>
                 <route type="mix" sink="record_24"
                        sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
                 <route type="mix" sink="mmap_no_irq_in"
diff --git a/properties/odm.prop b/properties/odm.prop
index 585fab2..189fa72 100644
--- a/properties/odm.prop
+++ b/properties/odm.prop
@@ -1,2 +1,5 @@
 # Qcom
 ro.vendor.qti.va_odm.support=1
+
+# FM Radio
+vendor.audio.feature.fm.enable=true
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 138c6e7..6700a78 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -167,6 +167,8 @@ ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.bluetooth.defaultabsvol=false
 persist.bluetooth.disableabsvol=true
 persist.vendor.bluetooth.modem_nv_support=true
+vendor.qcom.bluetooth.soc=cherokee
+ro.vendor.fm.use_audio_session=true
 
 # Camera
 camera.disable_zsl_mode=true