diff --git a/device-oriole.mk b/device-oriole.mk
index e0cd622..ab1a6ad 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -48,7 +48,8 @@ PRODUCT_COPY_FILES += \
 
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
-    device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv
+    device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
+    device/google/raviole/radio/oriole_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv
 
 # Camera
 PRODUCT_COPY_FILES += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index a8a0167..47175d3 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -165,6 +165,11 @@
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
     <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
 
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">gb7n6</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GB7N6.xml</string>
+
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a0f185f..fbffec0 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -176,11 +176,11 @@
     <item name="gps.voltage">3700</item>
 
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">98</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">470</item>
     <!-- Operating volatage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
 </device>
diff --git a/radio/oriole_camera_front_mipi_coex_table.csv b/radio/oriole_camera_front_mipi_coex_table.csv
new file mode 100644
index 0000000..c21cd6b
--- /dev/null
+++ b/radio/oriole_camera_front_mipi_coex_table.csv
@@ -0,0 +1,7 @@
+694270,706560
+
+930000,955000,694270
+2446000,2473000,694270
+5640000,5840000,694270
+2412000,2442000,706560
+5500000,5600000,706560
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 87a2410..f8536b0 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -153,4 +153,9 @@
       <item>750.0</item>          <!--  10000 - 20000 -->
       <item>900.0</item>          <!--  20000+ -->
     </array>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g8v0u</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G8V0U.xml</string>
 </resources>
diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a0f185f..fbffec0 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -176,11 +176,11 @@
     <item name="gps.voltage">3700</item>
 
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">98</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">470</item>
     <!-- Operating volatage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
 </device>
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index afa79f0..a2e12e5 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -295,6 +295,35 @@
             "Multiplier":1,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "vdroop1"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1200"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                 3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 872b284..b6689c5 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -295,6 +295,35 @@
             "Multiplier":1,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "vdroop1"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1200"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json
index b4c90a0..b2735b9 100644
--- a/thermal_info_config_slider.json
+++ b/thermal_info_config_slider.json
@@ -102,6 +102,35 @@
             "Multiplier":0.001,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "smpl_gm",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "smpl_gm"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1400"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json
index b4c90a0..b2735b9 100644
--- a/thermal_info_config_whitefin.json
+++ b/thermal_info_config_whitefin.json
@@ -102,6 +102,35 @@
             "Multiplier":0.001,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "smpl_gm",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "smpl_gm"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1400"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",