diff --git a/device.mk b/device.mk
index c621aec91dc8e286f658e6da10b04494d53ec9e6..9a11dba7a764431a0541d4b1275c608e6fc91cc2 100644
--- a/device.mk
+++ b/device.mk
@@ -317,8 +317,7 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
# RRO Overlays
PRODUCT_PACKAGES += \
- GS290NoCutoutOverlay \
- CarrierConfigOverlayGS290
+ GS290NoCutoutOverlay
# Screen density
PRODUCT_AAPT_CONFIG := normal
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d329c5b86e7aa2b578df53e91d059221eec4f6ec..43c6280f6faa1b7826efddc360c3975a626125cf 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -182,6 +182,16 @@
- ehrpd:4094,87380,1048576,4096,16384,262144
+
+ true
+
+
+ true
+
true
@@ -205,6 +215,9 @@
true
+
+ true
+
true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e021f231a06dab73c1e2aff0762e179bb6d52870..606998b868d81d66c97d2ce8e4d2ed120a4faa5b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1100,7 +1100,7 @@ vendor/lib64/libmtktinyxml.so
vendor/lib64/libmtkutils.so
vendor/lib64/libratconfig.so
vendor/lib64/librgbwlightsensor.so
-vendor/lib64/librilfusion.so
+vendor/lib64/librilfusion.so|f7232cfeec529c2c29008c99c6e065d62ba67eb2
vendor/lib64/libstereoinfoaccessor_vsdof.so
vendor/lib64/libsysenv.so
vendor/lib64/libwo.so
diff --git a/rootdir/etc/init.mt6763.rc b/rootdir/etc/init.mt6763.rc
index abcbe1865bbe57f09fdf1a24f27141b4013ff8a4..81866287fbb83c038e1721da44bd2ee8d20f0153 100644
--- a/rootdir/etc/init.mt6763.rc
+++ b/rootdir/etc/init.mt6763.rc
@@ -851,9 +851,9 @@ on property:sys.boot_completed=1
write /dev/stune/rt/schedtune.prefer_idle 0
# Force Disable VOLTE/VT/WFC Support
- setprop persist.dbg.volte_avail_ovr 0
- setprop persist.dbg.vt_avail_ovr 0
- setprop persist.dbg.wfc_avail_ovr 0
+ setprop persist.dbg.volte_avail_ovr 1
+ setprop persist.dbg.vt_avail_ovr 1
+ setprop persist.dbg.wfc_avail_ovr 1
# restore perf. parameters
write /proc/perfmgr/boost_ctrl/cpu_ctrl/boot_freq "-1 -1 -1 -1"
diff --git a/rro_overlays/CarrierConfigOverlayGS290/Android.bp b/rro_overlays/CarrierConfigOverlayGS290/Android.bp
deleted file mode 100644
index 46d8de8b83b8659c8b987baa84b6545a2862d415..0000000000000000000000000000000000000000
--- a/rro_overlays/CarrierConfigOverlayGS290/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime_resource_overlay {
- name: "CarrierConfigOverlayGS290",
- theme: "CarrierConfigOverlay",
- sdk_version: "current",
- product_specific: true,
- aaptflags: ["--keep-raw-values"],
-}
diff --git a/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml
deleted file mode 100644
index c9636030e5e5312ad8e28eae4051e47939cfb89f..0000000000000000000000000000000000000000
--- a/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
diff --git a/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml b/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml
deleted file mode 100644
index 87cdb2926c1540eccac2a7de1711f154734d0713..0000000000000000000000000000000000000000
--- a/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml
+++ /dev/null
@@ -1,921 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- com.google.android.ims
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 41919
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-