diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index f0c07911..7503ae6f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -411,6 +411,7 @@ on post-fs-data
 
 # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/catpipe 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker
 
diff --git a/manifest_64.xml b/manifest_64.xml
index a8b512be..5d43f5cf 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -62,15 +62,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index c63ff265..4addce85 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -141,4 +141,7 @@
 
     <!-- Enable aggregation of Wifi link layer radio stats from all radios -->
     <bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
+
+    <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
+    <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
 </resources>