diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml
index 2180a8a..ffcfc7f 100644
--- a/audio/cheetah/config/audio_policy_configuration.xml
+++ b/audio/cheetah/config/audio_policy_configuration.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
index f5c129f..0f38000 100644
--- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 92d97af..efd85b1 100644
--- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
index 7cf76e6..833ba9e 100644
--- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml
index 2180a8a..ffcfc7f 100644
--- a/audio/panther/config/audio_policy_configuration.xml
+++ b/audio/panther/config/audio_policy_configuration.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
index f5c129f..0f38000 100644
--- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 92d97af..efd85b1 100644
--- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
index 7cf76e6..833ba9e 100644
--- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
@@ -94,7 +94,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk
index 3cedf15..645f56c 100644
--- a/cheetah/BoardConfig.mk
+++ b/cheetah/BoardConfig.mk
@@ -20,7 +20,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index eecb57f..4d8952e 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -44,5 +44,8 @@
 
     <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
     <dimen name="lock_icon_padding">60px</dimen>
+
+    <!-- Pixel pitch of the device. um/px -->
+    <item name="pixel_pitch" format="float" type="dimen">49.6</item>
 </resources>
 
diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
index 0055264..2a576a6 100644
--- a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
@@ -32,4 +32,5 @@
   <integer-array name="antenna_y">
     <item>100</item>
   </integer-array>
+  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>
diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index a0f0ac0..20f6bbc 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -165,4 +165,12 @@
          regulatory approval (for example, FCC pre-approval is required according to "594280 D01
          Software Configuration Control v02r01").-->
     <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
+
+    <!-- Boolean indicating performing a partial initial scan is enabled -->
+    <bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
+
+    <!-- Configure the max number of new channels to add into the initial partial scan list per network.
+         If equals to 0, it means there's no limit on the max number of channels to include per network.-->
+    <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
+
 </resources>
diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk
index c2dcfa0..c5f39fe 100644
--- a/cloudripper/BoardConfig.mk
+++ b/cloudripper/BoardConfig.mk
@@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := cloudripper
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc
index dc2ff6c..53c7e91 100644
--- a/conf/init.cloudripper.rc
+++ b/conf/init.cloudripper.rc
@@ -61,27 +61,27 @@ on property:vendor.all.modules.ready=1
     chown system system /mnt/vendor/persist/haptics/cs40l26.cal
     chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal
 
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/8-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us
 
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/vibe_state
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/num_waves
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_offset
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/8-0042/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/8-0042/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/8-0042/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/8-0042/default/vibe_state
+    chown system system /sys/bus/i2c/devices/8-0042/default/num_waves
+    chown system system /sys/bus/i2c/devices/8-0042/default/f0_offset
+    chown system system /sys/bus/i2c/devices/8-0042/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/8-0042/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0042/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0042/default/delay_before_stop_playback_us
 
     enable vendor.vibrator.cs40l26
     enable vendor.vibrator.cs40l26-dual
diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 7ce1aea..6c8ec43 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -78,15 +78,15 @@ on property:vendor.all.modules.ready=1
     chown system system /mnt/vendor/persist/haptics
     chown system system /mnt/vendor/persist/haptics/cs40l26.cal
 
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/8-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us
 
     enable vendor.vibrator.cs40l26
diff --git a/device-cheetah.mk b/device-cheetah.mk
index f8e82fa..eb12309 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 TARGET_KERNEL_DIR ?= device/google/pantah-kernel
 TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers
+endif
+
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
@@ -276,7 +285,7 @@ PRODUCT_SOONG_NAMESPACES += \
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
@@ -298,7 +307,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
@@ -327,7 +336,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=44
+    ro.vendor.build.svn=50
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 5d30dee..7e59c5c 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -157,7 +157,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
diff --git a/device-panther.mk b/device-panther.mk
index c6f0794..bb23a15 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 TARGET_KERNEL_DIR ?= device/google/pantah-kernel
 TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers
+endif
+
 $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
@@ -256,7 +265,7 @@ PRODUCT_SOONG_NAMESPACES += \
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
@@ -282,7 +291,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
@@ -311,7 +320,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=44
+    ro.vendor.build.svn=50
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 2dcc35c..324bfde 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -147,7 +147,7 @@ PRODUCT_SOONG_NAMESPACES += \
 GOODIX_CONFIG_BUILD_VERSION := g6_trusty
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
@@ -170,7 +170,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
diff --git a/location/gps.xml b/location/gps.xml
index 4dd4ceb..c17d9b6 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -60,7 +60,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index f603aa9..0d8ce90 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -60,7 +60,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 92376f0..8ed3136 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -60,7 +60,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml b/location/gps_user.xml
index d64ba54..3cde3f9 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -59,7 +59,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        MaxThreadNum="13"
@@ -92,6 +92,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 6a15fe9..84c35e7 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -59,7 +59,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
@@ -92,6 +92,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 839aed3..3832f9b 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -59,7 +59,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
        SensorsMask="0x244"
@@ -92,6 +92,8 @@
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
        EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf
index feb933a..33e1565 100644
--- a/nfc/libnfc-hal-st-proto1.conf
+++ b/nfc/libnfc-hal-st-proto1.conf
@@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0
 
 ###############################################################################
 # Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
+STNFC_FW_DEBUG_ENABLED=1
 
 ###############################################################################
 # File used for NFA storage
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index f553e3d..ee5feaa 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0
 
 ###############################################################################
 # Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
+STNFC_FW_DEBUG_ENABLED=1
 
 ###############################################################################
 # File used for NFA storage
diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk
index 81f4438..1717606 100644
--- a/panther/BoardConfig.mk
+++ b/panther/BoardConfig.mk
@@ -23,7 +23,7 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index c0baa60..a675e21 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -51,5 +51,8 @@
 
     <!-- Movement should not be more than 1mm -->
     <dimen name="udfps_burn_in_offset_y">16px</dimen>
+
+    <!-- Pixel pitch of the device. um/px -->
+    <item name="pixel_pitch" format="float" type="dimen">61.0</item>
 </resources>
 
diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml
index d5bfd3d..43d41fc 100644
--- a/panther/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml
@@ -32,4 +32,5 @@
   <integer-array name="antenna_y">
     <item>97</item>
   </integer-array>
+  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index daa6e49..72b3674 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -165,4 +165,12 @@
          regulatory approval (for example, FCC pre-approval is required according to "594280 D01
          Software Configuration Control v02r01").-->
     <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
+
+    <!-- Boolean indicating performing a partial initial scan is enabled -->
+    <bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
+
+    <!-- Configure the max number of new channels to add into the initial partial scan list per network.
+         If equals to 0, it means there's no limit on the max number of channels to include per network.-->
+    <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
+
 </resources>
diff --git a/powerstats/cheetah/service.cpp b/powerstats/cheetah/service.cpp
index fa16eb1..18e0b7e 100644
--- a/powerstats/cheetah/service.cpp
+++ b/powerstats/cheetah/service.cpp
@@ -36,25 +36,32 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
-    std::vector<std::string> states = {
-        "Off",
-        "LP: 1440x3120@30",
-        "On: 1440x3120@10",
-        "On: 1440x3120@60",
-        "On: 1440x3120@120",
-        "HBM: 1440x3120@60",
-        "HBM: 1440x3120@120",
-        "LP: 1080x2340@30",
-        "On: 1080x2340@10",
-        "On: 1080x2340@60",
-        "On: 1080x2340@120",
-        "HBM: 1080x2340@60",
-        "HBM: 1080x2340@120"};
+    struct stat buffer;
+    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
+        // time_in_state exists
+        addDisplayMrr(p);
+    } else {
+        // time_in_state doesn't exist
+        std::vector<std::string> states = {
+            "Off",
+            "LP: 1440x3120@30",
+            "On: 1440x3120@10",
+            "On: 1440x3120@60",
+            "On: 1440x3120@120",
+            "HBM: 1440x3120@60",
+            "HBM: 1440x3120@120",
+            "LP: 1080x2340@30",
+            "On: 1080x2340@10",
+            "On: 1080x2340@60",
+            "On: 1080x2340@120",
+            "HBM: 1080x2340@60",
+            "HBM: 1080x2340@120"};
 
-    p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
-            "Display",
-            "/sys/class/backlight/panel0-backlight/state",
-            states));
+        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
+                "Display",
+                "/sys/class/backlight/panel0-backlight/state",
+                states));
+    }
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
@@ -120,20 +127,8 @@ int main() {
     addDisplay(p);
     addUwb(p);
 
-    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
-    } else {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
+    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats");
     }
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
diff --git a/powerstats/panther/service.cpp b/powerstats/panther/service.cpp
index 036faa4..6a49873 100644
--- a/powerstats/panther/service.cpp
+++ b/powerstats/panther/service.cpp
@@ -34,18 +34,25 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
-    std::vector<std::string> states = {
-        "Off",
-        "LP: 1080x2400@30",
-        "On: 1080x2400@60",
-        "On: 1080x2400@90",
-        "HBM: 1080x2400@60",
-        "HBM: 1080x2400@90"};
+    struct stat buffer;
+    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
+        // time_in_state exists
+        addDisplayMrr(p);
+    } else {
+        // time_in_state doesn't exist
+        std::vector<std::string> states = {
+            "Off",
+            "LP: 1080x2400@30",
+            "On: 1080x2400@60",
+            "On: 1080x2400@90",
+            "HBM: 1080x2400@60",
+            "HBM: 1080x2400@90"};
 
-    p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
-            "Display",
-            "/sys/class/backlight/panel0-backlight/state",
-            states));
+        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
+                "Display",
+                "/sys/class/backlight/panel0-backlight/state",
+                states));
+    }
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
@@ -70,20 +77,8 @@ int main() {
     addGs201CommonDataProviders(p);
     addDisplay(p);
 
-    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
-    } else {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
+    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats");
     }
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
diff --git a/powerstats/ravenclaw/service.cpp b/powerstats/ravenclaw/service.cpp
index f04acaf..31d1ee1 100644
--- a/powerstats/ravenclaw/service.cpp
+++ b/powerstats/ravenclaw/service.cpp
@@ -74,20 +74,8 @@ int main() {
     addGs201CommonDataProviders(p);
     addDisplay(p);
 
-    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
-    } else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
-    } else {
-        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
+    if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats");
     }
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk
index 8fc4e6a..1c21a93 100644
--- a/ravenclaw/BoardConfig.mk
+++ b/ravenclaw/BoardConfig.mk
@@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt
index 9fc0800..c783a92 100644
--- a/self-extractors_cheetah/extract-lists.txt
+++ b/self-extractors_cheetah/extract-lists.txt
@@ -11,7 +11,6 @@
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
             "
     ;;
diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk.template b/self-extractors_cheetah/google_devices/staging/Android.mk.template
index 0e329a3..e70bcb5 100644
--- a/self-extractors_cheetah/google_devices/staging/Android.mk.template
+++ b/self-extractors_cheetah/google_devices/staging/Android.mk.template
@@ -22,22 +22,6 @@ ifneq ($(filter cheetah,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter cheetah,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := PixelQualifiedNetworksService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonIms
diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk
index 45a4692..94b718d 100644
--- a/self-extractors_cheetah/google_devices/staging/device-partial.mk
+++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk
@@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
     UwbVendorService \
diff --git a/self-extractors_panther/extract-lists.txt b/self-extractors_panther/extract-lists.txt
index 63655a4..9f3c26f 100644
--- a/self-extractors_panther/extract-lists.txt
+++ b/self-extractors_panther/extract-lists.txt
@@ -10,7 +10,6 @@
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             "
     ;;
 
diff --git a/self-extractors_panther/google_devices/staging/Android.mk.template b/self-extractors_panther/google_devices/staging/Android.mk.template
index 7e7906a..484a2e3 100644
--- a/self-extractors_panther/google_devices/staging/Android.mk.template
+++ b/self-extractors_panther/google_devices/staging/Android.mk.template
@@ -22,22 +22,6 @@ ifneq ($(filter panther,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter panther,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := PixelQualifiedNetworksService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonIms
diff --git a/self-extractors_panther/google_devices/staging/device-partial.mk b/self-extractors_panther/google_devices/staging/device-partial.mk
index 38d2027..ce58ad8 100644
--- a/self-extractors_panther/google_devices/staging/device-partial.mk
+++ b/self-extractors_panther/google_devices/staging/device-partial.mk
@@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \