diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index 1d3689a..86e910b 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -307,7 +307,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
-        <module libname="audio_fortemedia_aoc.so" argu="BOOST_HANDSET_SWB_CLK=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/husky/tuning/fortemedia/mcps.dat b/audio/husky/tuning/fortemedia/mcps.dat
index 1c16314..7f3aeaa 100644
Binary files a/audio/husky/tuning/fortemedia/mcps.dat and b/audio/husky/tuning/fortemedia/mcps.dat differ
diff --git a/audio/ripcurrent/tuning/fortemedia/mcps.dat b/audio/ripcurrent/tuning/fortemedia/mcps.dat
index 04fc100..7f3aeaa 100644
Binary files a/audio/ripcurrent/tuning/fortemedia/mcps.dat and b/audio/ripcurrent/tuning/fortemedia/mcps.dat differ
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index 1d3689a..86e910b 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -307,7 +307,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
-        <module libname="audio_fortemedia_aoc.so" argu="BOOST_HANDSET_SWB_CLK=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/shiba/tuning/fortemedia/mcps.dat b/audio/shiba/tuning/fortemedia/mcps.dat
index 1c16314..7f3aeaa 100644
Binary files a/audio/shiba/tuning/fortemedia/mcps.dat and b/audio/shiba/tuning/fortemedia/mcps.dat differ
diff --git a/device-husky.mk b/device-husky.mk
index 2587d53..eff8e91 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -397,3 +397,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable camera exif model/make reporting
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.usb.uvc.enabled=true
diff --git a/device-shiba.mk b/device-shiba.mk
index 6a97833..4753538 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -372,3 +372,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable camera exif model/make reporting
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.usb.uvc.enabled=true
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 0f55f64..4551cde 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -1023,6 +1023,24 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1095,6 +1113,24 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPUBigClusterMaxFreq",
@@ -2435,19 +2471,19 @@
       "Value": "2"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_MID_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_BIG_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index d32554c..c05756f 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -1013,6 +1013,24 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1085,6 +1103,24 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 2000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPUBigClusterMaxFreq",
@@ -2323,19 +2359,19 @@
       "Value": "2"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_MID_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "CPU_BIG_TSKIN_BYPASS",
       "Duration": 0,
       "Value": "0"