diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 06dd935..05942f7 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 06dd935..05942f7 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index 4441cbd..e35ea23 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index 4441cbd..e35ea23 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc
index cfe3106..dd24fe4 100644
--- a/conf/init.oriole.rc
+++ b/conf/init.oriole.rc
@@ -27,3 +27,10 @@
     # Fingerprint
     chown system system /dev/goodix_fp
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
+
+# Toggle glove_mode according to touch_sensitivity_mode
+on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
+    write /sys/class/spi_master/spi11/spi11.0/glove_mode 00
+
+on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
+    write /sys/class/spi_master/spi11/spi11.0/glove_mode 01
diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index 6336a93..9eb01b9 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -34,3 +34,10 @@
 on property:mfgapi.touchpanel.permission=1
     chmod 0600 /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd
+
+# Toggle glove_mode according to touch_sensitivity_mode
+on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
+    write /sys/devices/virtual/sec/tsp/cmd "glove_mode,0"
+
+on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
+    write /sys/devices/virtual/sec/tsp/cmd "glove_mode,1"
diff --git a/device-oriole.mk b/device-oriole.mk
index 4b3308a..1ca4cad 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -19,6 +19,7 @@
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 
diff --git a/device-raven.mk b/device-raven.mk
index b59211a..f9f351b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -19,6 +19,7 @@
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 84814e3..d94b836 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -20,3 +20,4 @@
 
 include device/google/gs101/BoardConfig-common.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index cdd3e89..6d752a4 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -20,3 +20,4 @@
 
 include device/google/gs101/BoardConfig-common.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk