diff --git a/system.prop b/system.prop
index c00ebdafd76ab247252967e953f1d2b89a585535..645e211ef837065fe9123ed00f0a17b580fa21e9 100644
--- a/system.prop
+++ b/system.prop
@@ -36,6 +36,8 @@ media.stagefright.thumbnail.prefer_hw_codecs=true
 mm.enable.smoothstreaming=true
 persist.mm.enable.prefetch=true
 ro.media.recorder-max-base-layer-fps=60
+ro.media.xml_variant.codecs=lahaina
+ro.media.xml_variant.codecs_performance=lahaina
 vendor.mm.enable.qcom_parser=16777215
 
 # Netflix
@@ -56,6 +58,7 @@ persist.vendor.radio.report_codec=1
 ril.subscription.types=NV,RUIM
 rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
 ro.telephony.default_network=33,33
+ro.telephony.call_ring.multiple=false
 telephony.lteOnCdmaDevice=1
 
 # QC framework value-adds
@@ -71,6 +74,7 @@ persist.vendor.ssr.enable_ramdumps=1
 ro.hardware.wlan.chip=685x
 ro.hardware.wlan.mimo=1
 ro.hardware.wlan.vendor=qcom
+wifi.interface=wlan0
 
 # Wifi Display
 persist.debug.wfd.enable=1
diff --git a/vendor.prop b/vendor.prop
index c1b89bc72a2822af7050f3383eb8ceb8052458d2..abb02a7c5ccfa6c177d1a4e625884e7beaa1c4be 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -182,6 +182,9 @@ drm.service.enabled=true
 # FRP
 ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
+# Gatekeeper
+vendor.gatekeeper.disable_spu=true
+
 # Graphics
 debug.egl.hw=0
 debug.mdpcomp.logs=0
@@ -311,6 +314,7 @@ ril.subscription.types=NV,RUIM
 rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
 ro.telephony.default_cdma_sub=0
 ro.telephony.default_network=22,22
+ro.telephony.call_ring.multiple=false
 ro.vendor.radio.5g=3
 ro.vendor.use_data_netmgrd=true
 telephony.lteOnCdmaDevice=1
@@ -341,6 +345,7 @@ wifi.aware.interface=wifi-aware0
 ro.vendor.net.enable_dual_wifi=1
 ro.vendor.net.enable_passpoint_r1=1
 ro.vendor.net.enable_sla=1
+wifi.interface=wlan0
 
 # Wifi Display
 persist.debug.wfd.enable=1