diff --git a/audio/caiman/tuning/apmg3/downlink_handset_config.pb b/audio/caiman/tuning/apmg3/downlink_handset_config.pb
index fab1f2a4..59cfa128 100644
Binary files a/audio/caiman/tuning/apmg3/downlink_handset_config.pb and b/audio/caiman/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/downlink_speaker_config.pb b/audio/caiman/tuning/apmg3/downlink_speaker_config.pb
index 1aa4a7a9..64ea274b 100644
Binary files a/audio/caiman/tuning/apmg3/downlink_speaker_config.pb and b/audio/caiman/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 40dd10b6..a6dfdce9 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
index 2cf36927..58ac211e 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb and b/audio/caiman/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_dock_aec_off_config.pb
index 7a9e57d4..fb82a78c 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
index 38141ba7..71038798 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
index 6ee72a18..d747bc2e 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_on_config.pb and b/audio/caiman/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_handset_aec_off_config.pb
index b70f2b45..93519453 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_handset_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/caiman/tuning/apmg3/uplink_handset_aec_on_config.pb
index 8fae5301..58dc380a 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_handset_aec_on_config.pb and b/audio/caiman/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_speaker_aec_off_config.pb
index fa7ee4b5..02348b94 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_speaker_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/caiman/tuning/apmg3/uplink_speaker_aec_on_config.pb
index 7cf55141..ca7cc26e 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/caiman/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
index 3578e0ea..679aa66f 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_off_config.pb and b/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
index 791ff9e4..fec3962d 100644
Binary files a/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_on_config.pb and b/audio/caiman/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ
diff --git a/audio/caiman/tuning/spatializer/base b/audio/caiman/tuning/spatializer/base
index 38cc646e..42b4329e 100644
Binary files a/audio/caiman/tuning/spatializer/base and b/audio/caiman/tuning/spatializer/base differ
diff --git a/audio/caiman/tuning/spatializer/mode_2_ch b/audio/caiman/tuning/spatializer/mode_2_ch
index 470c56cf..2610b2d9 100644
Binary files a/audio/caiman/tuning/spatializer/mode_2_ch and b/audio/caiman/tuning/spatializer/mode_2_ch differ
diff --git a/audio/caiman/tuning/spatializer/mode_6_ch b/audio/caiman/tuning/spatializer/mode_6_ch
index 94ec6356..0f432fa3 100644
Binary files a/audio/caiman/tuning/spatializer/mode_6_ch and b/audio/caiman/tuning/spatializer/mode_6_ch differ
diff --git a/audio/caiman/tuning/spatializer/mode_xaural b/audio/caiman/tuning/spatializer/mode_xaural
index b3a3a962..619e215f 100644
Binary files a/audio/caiman/tuning/spatializer/mode_xaural and b/audio/caiman/tuning/spatializer/mode_xaural differ
diff --git a/audio/komodo/tuning/apmg3/downlink_handset_config.pb b/audio/komodo/tuning/apmg3/downlink_handset_config.pb
index f23816a2..ecdef83f 100644
Binary files a/audio/komodo/tuning/apmg3/downlink_handset_config.pb and b/audio/komodo/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/downlink_speaker_config.pb b/audio/komodo/tuning/apmg3/downlink_speaker_config.pb
index 93522218..595ee962 100644
Binary files a/audio/komodo/tuning/apmg3/downlink_speaker_config.pb and b/audio/komodo/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 40dd10b6..a6dfdce9 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
index 2cf36927..58ac211e 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb and b/audio/komodo/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_dock_aec_off_config.pb
index 7a9e57d4..fb82a78c 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
index 38141ba7..71038798 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
index 6ee72a18..d747bc2e 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_on_config.pb and b/audio/komodo/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_handset_aec_off_config.pb
index 69f3f25c..93519453 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_handset_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/komodo/tuning/apmg3/uplink_handset_aec_on_config.pb
index b6e36a88..58dc380a 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_handset_aec_on_config.pb and b/audio/komodo/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_speaker_aec_off_config.pb
index f7cad5e7..02348b94 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_speaker_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/komodo/tuning/apmg3/uplink_speaker_aec_on_config.pb
index 21659250..8b2269f0 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/komodo/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
index 3578e0ea..679aa66f 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_off_config.pb and b/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
index 791ff9e4..fec3962d 100644
Binary files a/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_on_config.pb and b/audio/komodo/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ
diff --git a/audio/komodo/tuning/spatializer/base b/audio/komodo/tuning/spatializer/base
index 38cc646e..42b4329e 100644
Binary files a/audio/komodo/tuning/spatializer/base and b/audio/komodo/tuning/spatializer/base differ
diff --git a/audio/komodo/tuning/spatializer/mode_2_ch b/audio/komodo/tuning/spatializer/mode_2_ch
index 470c56cf..2610b2d9 100644
Binary files a/audio/komodo/tuning/spatializer/mode_2_ch and b/audio/komodo/tuning/spatializer/mode_2_ch differ
diff --git a/audio/komodo/tuning/spatializer/mode_6_ch b/audio/komodo/tuning/spatializer/mode_6_ch
index 94ec6356..0f432fa3 100644
Binary files a/audio/komodo/tuning/spatializer/mode_6_ch and b/audio/komodo/tuning/spatializer/mode_6_ch differ
diff --git a/audio/komodo/tuning/spatializer/mode_xaural b/audio/komodo/tuning/spatializer/mode_xaural
index b3a3a962..619e215f 100644
Binary files a/audio/komodo/tuning/spatializer/mode_xaural and b/audio/komodo/tuning/spatializer/mode_xaural differ
diff --git a/audio/tokay/tuning/apmg3/downlink_handset_config.pb b/audio/tokay/tuning/apmg3/downlink_handset_config.pb
index 210b0dbf..7129053f 100644
Binary files a/audio/tokay/tuning/apmg3/downlink_handset_config.pb and b/audio/tokay/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/downlink_speaker_config.pb b/audio/tokay/tuning/apmg3/downlink_speaker_config.pb
index 51448517..df500a00 100644
Binary files a/audio/tokay/tuning/apmg3/downlink_speaker_config.pb and b/audio/tokay/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 40dd10b6..a6dfdce9 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
index 2cf36927..58ac211e 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb and b/audio/tokay/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_dock_aec_off_config.pb
index 7a9e57d4..fb82a78c 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
index 38141ba7..71038798 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
index 6ee72a18..d747bc2e 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_on_config.pb and b/audio/tokay/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_handset_aec_off_config.pb
index 7adbc076..93519453 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_handset_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/tokay/tuning/apmg3/uplink_handset_aec_on_config.pb
index 13fc355e..58dc380a 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_handset_aec_on_config.pb and b/audio/tokay/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_speaker_aec_off_config.pb
index 48e1227f..02348b94 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_speaker_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/tokay/tuning/apmg3/uplink_speaker_aec_on_config.pb
index a58689cf..e29ae1d6 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/tokay/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
index 3578e0ea..679aa66f 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_off_config.pb and b/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
index 791ff9e4..fec3962d 100644
Binary files a/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_on_config.pb and b/audio/tokay/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ
diff --git a/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml b/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
index 027bcea8..969fd435 100644
--- a/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
+++ b/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <xml>
-    <spec>
-        <vol step="1">-56.154594,-57.110912</vol>
-        <vol step="2">-53.155884,-54.127373</vol>
-        <vol step="3">-49.756584,-50.737946</vol>
-        <vol step="4">-46.936535,-47.922485</vol>
-        <vol step="5">-43.24405,-44.23973</vol>
-        <vol step="6">-39.813145,-40.822468</vol>
-        <vol step="7">-36.94418,-37.96505</vol>
-        <vol step="8">-34.103817,-35.12746</vol>
-        <vol step="9">-32.26378,-33.29418</vol>
-        <vol step="10">-30.093319,-31.127796</vol>
-        <vol step="11">-27.625238,-28.658443</vol>
-        <vol step="12">-25.123178,-26.156292</vol>
-        <vol step="13">-23.122547,-24.157629</vol>
-        <vol step="14">-21.27267,-22.309628</vol>
-        <vol step="15">-19.260181,-20.323017</vol>
-        <vol step="16">-17.789768,-18.920961</vol>
-        <vol step="17">-16.70663,-17.944777</vol>
-        <vol step="18">-15.632062,-16.883278</vol>
-        <vol step="19">-14.59099,-15.903705</vol>
-        <vol step="20">-13.215048,-14.563754</vol>
-        <vol step="21">-12.320514,-13.758759</vol>
-        <vol step="22">-11.425067,-12.607503</vol>
-        <vol step="23">-10.545513,-11.783849</vol>
-        <vol step="24">-9.59371,-10.908389</vol>
-        <vol step="25">-8.927933,-10.219385</vol>
+    <spec feature="normal">
+        <vol step="1">-55.633537,-57.12799</vol>
+        <vol step="2">-52.74118,-54.248005</vol>
+        <vol step="3">-49.229015,-50.760155</vol>
+        <vol step="4">-46.39415,-47.93267</vol>
+        <vol step="5">-42.696896,-44.252502</vol>
+        <vol step="6">-39.243034,-40.831715</vol>
+        <vol step="7">-36.365067,-37.983456</vol>
+        <vol step="8">-33.502815,-35.130657</vol>
+        <vol step="9">-31.668825,-33.308605</vol>
+        <vol step="10">-29.462334,-31.116865</vol>
+        <vol step="11">-26.979172,-28.646566</vol>
+        <vol step="12">-24.473492,-26.155708</vol>
+        <vol step="13">-22.479034,-24.18116</vol>
+        <vol step="14">-20.641127,-22.376537</vol>
+        <vol step="15">-18.619516,-20.410694</vol>
+        <vol step="16">-17.039654,-18.978006</vol>
+        <vol step="17">-15.964582,-18.063643</vol>
+        <vol step="18">-14.847198,-17.068687</vol>
+        <vol step="19">-13.786341,-16.13179</vol>
+        <vol step="20">-12.377989,-14.879541</vol>
+        <vol step="21">-11.468842,-14.155666</vol>
+        <vol step="22">-10.673872,-13.19977</vol>
+        <vol step="23">-9.866504,-12.5231495</vol>
+        <vol step="24">-9.465342,-12.234019</vol>
+        <vol step="25">-9.418919,-12.183332</vol>
     </spec>
-</xml>
\ No newline at end of file
+</xml>
+
diff --git a/audio/tokay/tuning/spatializer/base b/audio/tokay/tuning/spatializer/base
index 38cc646e..42b4329e 100644
Binary files a/audio/tokay/tuning/spatializer/base and b/audio/tokay/tuning/spatializer/base differ
diff --git a/audio/tokay/tuning/spatializer/mode_2_ch b/audio/tokay/tuning/spatializer/mode_2_ch
index 470c56cf..2610b2d9 100644
Binary files a/audio/tokay/tuning/spatializer/mode_2_ch and b/audio/tokay/tuning/spatializer/mode_2_ch differ
diff --git a/audio/tokay/tuning/spatializer/mode_6_ch b/audio/tokay/tuning/spatializer/mode_6_ch
index 94ec6356..0f432fa3 100644
Binary files a/audio/tokay/tuning/spatializer/mode_6_ch and b/audio/tokay/tuning/spatializer/mode_6_ch differ
diff --git a/audio/tokay/tuning/spatializer/mode_xaural b/audio/tokay/tuning/spatializer/mode_xaural
index b3a3a962..619e215f 100644
Binary files a/audio/tokay/tuning/spatializer/mode_xaural and b/audio/tokay/tuning/spatializer/mode_xaural differ
diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk
index 924fcb35..034b3e71 100644
--- a/caiman/BoardConfig.mk
+++ b/caiman/BoardConfig.mk
@@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/caiman-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
diff --git a/device-caiman.mk b/device-caiman.mk
index 9def00d9..2f59421a 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -70,6 +70,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_CAIMAN
@@ -485,8 +486,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Caiman: 0x4110
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20496
+    bluetooth.device_id.product_id=16656
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 4496f6e0..9ac96c71 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -70,6 +70,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_KOMODO
@@ -486,8 +487,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Komodo: 0x4111
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20497
+    bluetooth.device_id.product_id=16657
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 062f26d3..1cc3b6fe 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -44,6 +44,7 @@ include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # go/lyric-soong-variables
 # Set to 'ripcurrent' as ripcurrent camera service is compatible with ripcurrent24.
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 43c4c1ab..0eb62559 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -47,6 +47,7 @@ include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,ripcurrentpro)
diff --git a/device-tokay.mk b/device-tokay.mk
index fbc142b1..7e1b95d0 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -60,6 +60,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
+include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
 
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_TOKAY
@@ -451,8 +452,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Tokay: 0x4112
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20498
+    bluetooth.device_id.product_id=16658
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk
index a7ae1294..6b30ab16 100644
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/komodo-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index 8c6515aa..745ce932 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 9276d626..92945760 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index fcbf35cf..8c984f02 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index f7005830..4848595d 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 337e44bc..0c526912 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index 418045c1..ae2fdf21 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index 337e44bc..0c526912 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index 418045c1..ae2fdf21 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index 6a6f63df..53931f75 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 74f52461..4bd46561 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/manifest.xml b/manifest.xml
index e01d156c..18109c63 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index f557c4f1..8c246e13 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 1dddb841..34f7fc0d 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 81858c83..ea0edaed 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -222,7 +222,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -471,7 +470,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -511,7 +509,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index f557c4f1..8c246e13 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/ripcurrent24/BoardConfig.mk b/ripcurrent24/BoardConfig.mk
index 58b90fe7..e9121e90 100644
--- a/ripcurrent24/BoardConfig.mk
+++ b/ripcurrent24/BoardConfig.mk
@@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/caimito-sepolicy/ripcurrent24-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
diff --git a/ripcurrentpro/BoardConfig.mk b/ripcurrentpro/BoardConfig.mk
index ca496d0b..bc66ab01 100644
--- a/ripcurrentpro/BoardConfig.mk
+++ b/ripcurrentpro/BoardConfig.mk
@@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/caimito-sepolicy/ripcurrentpro-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index 3c16a797..608b533f 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -28,6 +28,7 @@ include device/google/caimito/device-caimito-common.mk
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/tokay-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk