diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf
index 85d0a04..ae53a98 100644
--- a/audio/audio_ext_spkr.conf
+++ b/audio/audio_ext_spkr.conf
@@ -1,26 +1,30 @@
 global_config {
     name Sanders
-    sonification_pad 20
+    sonification_pad 21
     sonification_prox_timeout_sec 5
+    force_ring_ramp true
 }
 
 ring {
     #dB to attenuate playback to meet safety level at each volume step
     #16 steps total, 15...0.  In case of truncated list, last attenuation
     #given will be applied to all lower volume steps
-    #attenuation 28,28,25,25,22,22,20,20,20,20,20,20,20,20,20,20
+    attenuation 35,33,30,28,26,23,21,19,16,14,11,9,7,3,0,0
+    knee_step 16
 }
 
 voice {
     #dB to attenuate playback to meet safety level at each volume step
     #16 steps total, 15...0.  In case of truncated list, last attenuation
     #given will be applied to all lower volume steps
-    #attenuation 35,35,32,32,29,29,26,26,23,23,20,20,17,17,14,14
+    attenuation 32,29,29,26,26,23,23,20,20,17,17,14,14,11,11,11
+    knee_step 16
 }
 
 media {
     #dB to attenuate playback to meet safety level at each volume step
     #16 steps total, 15...0.  In case of truncated list, last attenuation
     #given will be applied to all lower volume steps
-    #attenuation 38,36,34,32,30,28,26,24,22,20,18,16,14,12,10,8
+    attenuation 35,33,30,28,26,23,21,19,16,14,11,9,7,3,0,0
+    knee_step 16
 }
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index 1ff999c..e10c444 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -263,6 +263,16 @@
 		<path name="deep-buffer-playback bt-sco" />
 	</path>
 
+	<path name="deep-buffer-playback speaker-and-bt-sco">
+		<path name="deep-buffer-playback" />
+		<path name="deep-buffer-playback bt-sco" />
+	</path>
+
+	<path name="deep-buffer-playback speaker-and-bt-sco-wb">
+		<path name="deep-buffer-playback" />
+		<path name="deep-buffer-playback bt-sco-wb" />
+	</path>
+
 	<path name="deep-buffer-playback afe-proxy">
 		<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
 	</path>
@@ -299,6 +309,16 @@
 		<path name="low-latency-playback bt-sco" />
 	</path>
 
+	<path name="low-latency-playback speaker-and-bt-sco">
+		<path name="low-latency-playback" />
+		<path name="low-latency-playback bt-sco" />
+	</path>
+
+	<path name="low-latency-playback speaker-and-bt-sco-wb">
+		<path name="low-latency-playback" />
+		<path name="low-latency-playback bt-sco-wb" />
+	</path>
+
 	<path name="low-latency-playback afe-proxy">
 		<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
 	</path>
@@ -339,6 +359,16 @@
 		<path name="audio-ull-playback bt-sco" />
 	</path>
 
+	<path name="audio-ull-playback speaker-and-bt-sco">
+		<path name="audio-ull-playback" />
+		<path name="audio-ull-playback bt-sco" />
+	</path>
+
+	<path name="audio-ull-playback speaker-and-bt-sco-wb">
+		<path name="audio-ull-playback" />
+		<path name="audio-ull-playback bt-sco-wb" />
+	</path>
+
 	<path name="audio-ull-playback afe-proxy">
 		<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" />
 	</path>
@@ -380,6 +410,16 @@
 		<path name="compress-offload-playback bt-sco" />
 	</path>
 
+	<path name="compress-offload-playback speaker-and-bt-sco">
+		<path name="compress-offload-playback" />
+		<path name="compress-offload-playback bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback" />
+		<path name="compress-offload-playback bt-sco-wb" />
+	</path>
+
 	<path name="compress-offload-playback afe-proxy">
 		<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
 	</path>
diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index 2c1befd..2c91966 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -165,6 +165,7 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/msm_vidc_dec_sec     0660   system     audio
 /dev/msm_vidc_enc         0660   system     audio
 /dev/msm_rotator          0660   system     system
+/dev/hw_random            0600   root       root
 /dev/sdsprpc-smd          0660   system     system
 
 #permissions for audio
@@ -295,6 +296,7 @@ firmware_directories /vendor/firmware_mnt/image/
 # wigig
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/fst_link_loss 0660 wifi wifi
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/thermal_throttling 0660 system system
+/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/snr_thresh 0660 wifi wifi
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/queues/rx-0/rps_cpus 0660 system system
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/gro_flush_timeout 0660 system system
 /sys/devices/virtual/net/bond0 queues/rx-0/rps_cpus 0660 system system