diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index ccc078c..93aa2f9 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index ccc078c..93aa2f9 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index cad5bd1..da25109 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index cad5bd1..da25109 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/device-raven.mk b/device-raven.mk
index 6d9f26d..8ef95c3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -27,6 +27,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 
 include device/google/gs101/device-shipping-common.mk
 include device/google/gs101/fingerprint/udfps.mk
+ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
+include device/google/gs101/uwb/uwb.mk
+endif
 include device/google/raviole/audio/raven/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk