diff --git a/sdm660_64.mk b/sdm660_64.mk
index 81fbce3b..25a83332 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -210,9 +210,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \
     frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml
 
-# High performance VR feature
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.vr.high_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vr.high_performance.xml
+#Facing, CMC and Gesture
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.sensors.facing=false \
+    ro.vendor.sensors.cmc=false \
+    ro.vendor.sdk.sensors.gestures=false
 
 # FBE support
 PRODUCT_COPY_FILES += \
diff --git a/system.prop b/system.prop
index ae1e3e5f..55c2f2d9 100644
--- a/system.prop
+++ b/system.prop
@@ -146,6 +146,9 @@ ro.hwui.text_small_cache_height=1024
 ro.hwui.text_large_cache_width=2048
 ro.hwui.text_large_cache_height=2048
 
+#Bringup properties
+persist.radio.atfwd.start=true
+
 #property to enable VDS WFD solution
 persist.hwc.enable_vds=1
 
@@ -161,12 +164,6 @@ ro.vendor.sensors.pmd=true
 ro.vendor.sensors.sta_detect=true
 #Motion Detector
 ro.vendor.sensors.mot_detect=true
-#Facing
-ro.vendor.sensors.facing=false
-#CMC
-ro.vendor.sensors.cmc=false
-#Gesture
-ro.vendor.sdk.sensors.gestures=false
 
 #Expose aux camera for below packages
 camera.aux.packagelist=org.codeaurora.snapcam
@@ -189,4 +186,4 @@ persist.backup.ntpServer="0.pool.ntp.org"
 persist.vendor.overlay.izat.optin=rro
 
 #Disable Skip Validate
-sdm.debug.disable_skip_validate=1
\ No newline at end of file
+sdm.debug.disable_skip_validate=1