diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1b246e1..73eafa2 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -95,6 +95,9 @@
 ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
 AB_OTA_PARTITIONS += vbmeta
 endif
+ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
+AB_OTA_PARTITIONS += pvmfw
+endif
 
 # EMULATOR common modules
 BOARD_EMULATOR_COMMON_MODULES := liblight
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index bf63c26..c760bcb 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -297,6 +297,8 @@
     chown system system /sys/devices/platform/google,charger/charge_start_level
     chown system system /sys/devices/platform/google,charger/charge_stop_level
     chown system system /sys/devices/platform/google,cpm/dc_ctl
+    # Important to include dd_state as it's used in battery defender in charger mode
+    chown system system /sys/devices/platform/google,charger/dd_state
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
@@ -326,10 +328,6 @@
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
-# For GKI kernel, no device specific modules
-on init
-    setprop vendor.device.modules.ready 1
-
 on init && property:ro.boot.hw.soc.rev=0
     setprop vendor.powerhal.config powerhint_a0.json
 
@@ -472,13 +470,6 @@
     # Wait for insmod_sh to finish all common modules
     wait_for_prop vendor.common.modules.ready 1
 
-    # Wait for insmod_sh to finish all device specific modules
-    wait_for_prop vendor.device.modules.ready 1
-
-    # Other services depend on the properties
-    setprop vendor.all.modules.ready 1
-    setprop vendor.all.devices.ready 1
-
     # Permission for Health Storage HAL
     chown system system /dev/sys/block/bootdevice/manual_gc
 
@@ -934,12 +925,9 @@
     write /dev/thermal/tz-by-name/soc/policy user_space
     write /dev/thermal/tz-by-name/batoilo/policy user_space
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 9000
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_gpu_lvl 9000
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_tpu_lvl 8500
-    write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x201
-    write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x801
-    write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x801
+    write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
+    write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
+    write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1
     chown system system /dev/thermal/tz-by-name/soc/mode
     chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst
@@ -985,19 +973,10 @@
     chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
     chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
 
-# Create thermal symlink in off charging mode
 on charger
-    mkdir /dev/thermal 0750 system system
-    mkdir /dev/thermal/tz-by-name 0750 system system
-    mkdir /dev/thermal/cdev-by-name 0750 system system
-    start vendor.thermal.symlinks
     write /proc/vendor_sched/sys_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
 
-# Launch thermal hal in off charging mode
-on charger && property:vendor.thermal.link_ready=1
-    start vendor.thermal-hal-2-0
-
 on property:vendor.disable.bcl.control=1
     write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0
 
@@ -1008,6 +987,8 @@
 on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
     # Enable UFS powersaving in Off Mode Charger
     write /dev/sys/block/bootdevice/clkgate_enable 1
+    # Disable dock-defend in Off Mode Charger
+    write /sys/devices/platform/google,charger/dd_state -1
 
 # Cpuset experiment
 on property:persist.device_config.vendor_system_native.top-app_cpuset=*
diff --git a/conf/ueventd.gs101.rc b/conf/ueventd.gs101.rc
index 2f03009..a821fd1 100644
--- a/conf/ueventd.gs101.rc
+++ b/conf/ueventd.gs101.rc
@@ -142,7 +142,8 @@
 /dev/aoc                 0660   system     system
 
 # Sensors (USF)
-/dev/acd-com.google.usf  0660   system     system
+/dev/acd-com.google.usf  		0660   system     system
+/dev/acd-com.google.usf.non_wake_up	0660   system     system
 
 # LWIS
 /dev/lwis*               0660   system     system
diff --git a/device-common.mk b/device-common.mk
index 4087c31..e45397d 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -43,3 +43,7 @@
 
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk
+
+# Set thermal warm reset
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.thermal_warmreset = true
diff --git a/device-shipping-common.mk b/device-shipping-common.mk
index 49897aa..a4539fc 100644
--- a/device-shipping-common.mk
+++ b/device-shipping-common.mk
@@ -18,5 +18,5 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=true \
     persist.bluetooth.a2dp_offload.disabled=false \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/device.mk b/device.mk
index e7af97e..3ea32c3 100644
--- a/device.mk
+++ b/device.mk
@@ -941,7 +941,11 @@
 #$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
 #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
+ifeq ($(wildcard vendor/google/sensors/usf),)
+$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/usf/usf_product.mk)
+else
 $(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
+endif
 $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 863fc2a..3c24f9a 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -25,7 +25,7 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>com.fingerprints35.extension</name>
+        <name>com.fingerprints42.extension</name>
         <version>1.0</version>
         <interface>
             <name>IFingerprintAuthenticator</name>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index b75ba64..e20065a 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -379,6 +379,7 @@
     DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm");
     DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468");
 
+    DumpFileToFd(fd, "Battery Health", "/sys/class/power_supply/battery/health_index_stats");
     DumpFileToFd(fd, "BMS", "/dev/logbuffer_ssoc");
     DumpFileToFd(fd, "TTF", "/dev/logbuffer_ttf");
     DumpFileToFd(fd, "TTF details", "/sys/class/power_supply/battery/ttf_details");
diff --git a/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
new file mode 100644
index 0000000..fe8cf8b
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
@@ -0,0 +1,28 @@
+# ----------------------------
+# Add feature flags below
+# ----------------------------
+FPC_CONFIG_BUILD_VERSION=42
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+FPC_CONFIG_HAL_SHARED_LIB=1
+FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NO_TU=0
+FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
+FPC_CONFIG_TA_FS=1
+FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_OTP_DECODE_ERRORS_IGNORE=1
+FPC_SENSOR_SDK_LOG_LEVEL=3
+FPC_TEE_RUNTIME=TRUSTY
+LIBFPC_NAME=libfpcmulti_debug.a
+FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
+FPC_CONFIG_GOOGLE_RELEASE=1
+FPC_CONFIG_TRUSTY_CLEAN_TA=1
+
+GOOGLE_CONFIG_PERFORMANCE=1
+
+# Enable Suez
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
+
+# Must add below method to each project's device.mk to show sensorLocation
+#$(call soong_config_set,fp_hal_feature,pixel_product, project_XX)
diff --git a/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
new file mode 100644
index 0000000..4b2567d
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
@@ -0,0 +1,18 @@
+# ----------------------------
+# Add feature flags below
+# ----------------------------
+FPC_CONFIG_BUILD_VERSION=42
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NO_TU=0
+FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
+FPC_CONFIG_TA_FS=1
+FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_OTP_DECODE_ERRORS_IGNORE=1
+FPC_SENSOR_SDK_LOG_LEVEL=3
+FPC_TEE_RUNTIME=TRUSTY
+LIBFPC_NAME=libfpcmulti_debug.a
+FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
+
diff --git a/fingerprint/fpc1540/sw42/fpc1540.mk b/fingerprint/fpc1540/sw42/fpc1540.mk
new file mode 100644
index 0000000..7770538
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fpc1540.mk
@@ -0,0 +1,30 @@
+# Factory build, use HIDL hal & extension so that we can use Test tool
+ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
+include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service.fpc \
+    fpc_tee_test\
+    SensorTestTool \
+    ImageTool \
+    ImageCollection \
+    fp_test \
+
+PRODUCT_PACKAGES += \
+    com.fingerprints.extension.xml \
+    com.fingerprints.extension \
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+else
+# Non facotry build, use fingerprint AIDL version
+include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
+
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint-service.fpc42 \
+    fingerprint.fpc \
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+endif
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
index cf16410..e8709e1 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
Binary files differ
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
index b9fee32..92e111e 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
Binary files differ
diff --git a/gnss/47765/bin/flp.default.so b/gnss/47765/bin/flp.default.so
index ae700bd..14efdc9 100755
--- a/gnss/47765/bin/flp.default.so
+++ b/gnss/47765/bin/flp.default.so
Binary files differ
diff --git a/gnss/47765/bin/gps.default.so b/gnss/47765/bin/gps.default.so
index 771e4be..f10c5ac 100755
--- a/gnss/47765/bin/gps.default.so
+++ b/gnss/47765/bin/gps.default.so
Binary files differ
diff --git a/gnss/47765/bin/gpsd b/gnss/47765/bin/gpsd
index 34c8012..eab5908 100755
--- a/gnss/47765/bin/gpsd
+++ b/gnss/47765/bin/gpsd
Binary files differ
diff --git a/gnss/47765/bin/lhd b/gnss/47765/bin/lhd
index 5854d35..14584c0 100755
--- a/gnss/47765/bin/lhd
+++ b/gnss/47765/bin/lhd
Binary files differ
diff --git a/gnss/47765/bin/scd b/gnss/47765/bin/scd
index 631d7c8..a7a7b2d 100755
--- a/gnss/47765/bin/scd
+++ b/gnss/47765/bin/scd
Binary files differ
diff --git a/gnss/47765/firmware/SensorHub.patch b/gnss/47765/firmware/SensorHub.patch
index 30f4b71..b2757b0 100644
--- a/gnss/47765/firmware/SensorHub.patch
+++ b/gnss/47765/firmware/SensorHub.patch
@@ -1,9 +1,9 @@
 <FormatVersion=0x00010003>
 
-<Crc=112>
+<Crc=133>
 <BlobLength=161839>
 <AsicVersion=0x004776A0>
-<ChangeList=540442>
+<ChangeList=542941>
 <PatchLevel=0>
 <PostPatchLevel=1>
 <CustomerVersion=None>
@@ -79,7 +79,7 @@
 009102A101F438F703B000BD4170700080BD8900708989
 00805D8A006905800025643A2564095374617274206368
 70704170705461736B0A00000000633A5C77735C626F64
-5F3437373631303539335F3534303434325C637573746F
+5F3437373631303738335F3534323934315C637573746F
 6D6572735C676F6F676C655C503231466C61677461696C
 6D63755C64656C69766572795C53656E736F724875625F
 5032315C7372635C6875625F636F6E74726F6C6C65722E
@@ -390,7 +390,7 @@
 F22046FEF700FF07E002464FF4D1630FF2F4518F2011F4
 5FF2FEF769FC04F5A6620A23C2E9000105F0F00006F00F
 0101433A462046BDE8F041FFF7BDBB0000633A5C77735C
-626F645F3437373631303539335F3534303434325C6375
+626F645F3437373631303738335F3534323934315C6375
 73746F6D6572735C676F6F676C655C503231466C616774
 61696C6D63755C64656C69766572795C53656E736F7248
 75625F5032315C7372635C636870705C7472616E73706F
@@ -526,7 +526,7 @@
 25210378204626F4F1F510B010BD000025643A25640948
 232568687520756E6B6E6F776E20726571756573742E20
 636D643D2523782C2049443D256868750A00633A5C7773
-5C626F645F3437373631303539335F3534303434325C63
+5C626F645F3437373631303738335F3534323934315C63
 7573746F6D6572735C676F6F676C655C503231466C6167
 7461696C6D63755C64656C69766572795C53656E736F72
 4875625F5032315C7372F19403502E8000635C63687070
@@ -585,7 +585,7 @@
 D803B000BDF07E8A000C53890028878A00113280009D32
 800025643A256409434850502042617564726174652069
 732073657420746F20256C640A0A00633A5C77735C626F
-645F3437373631303539335F3534303434325C63757374
+645F3437373631303738335F3534323934315C63757374
 6F6D6572735C676F6F676C655C503231466C6167746169
 6C6D63755C64656C69766572795C53656E736F72487562
 5F5032315C7372635C73656E736F725F6875622E630000
@@ -679,13 +679,13 @@
 B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
 12D00020009069462846FDF712DE761E012804DB024600
 992046FEF79EF82846FDF76FDD002EECD173BD70470000
-633A5C77735C626F645F3437373631303539335F353430
-3434325C637573746F6D6572735C676F6F676C655C5032
+633A5C77735C626F645F3437373631303738335F353432
+3934315C637573746F6D6572735C676F6F676C655C5032
 31466C61677461696C6D63755C64656C69766572795C53
 656E736F724875625F5032315C7372635C636870705C69
 6E636C7564655C636870702F7472616E73706F72742E68
-00633A5C77735C626F645F3437373631303539335F3534
-303434325C637573746F6D6572735C676F6F676C655C50
+00633A5C77735C626F645F3437373631303738335F3534
+323934315C637573746F6D6572735C676F6F676C655C50
 3231466C61677461696C6D63755C64656C69766572795C
 53656E736F724875625F5032315C7372635C636870705C
 706C6174666F726D5C62636D5C42434D343737785C6C69
@@ -696,7 +696,7 @@
 D1D6E90223D0E918679F42E7D8E8D39642E4D2E5E7D0E9
 1823CDE900230FF27C010FF2100240F21E238F200FF4B1
 F403B0F0BD0000633A5C77735C626F645F343737363130
-3539335F3534303434325C637573746F6D6572735C676F
+3738335F3534323934315C637573746F6D6572735C676F
 6F676C655C503231466C61677461696C6D63755C64656C
 69766572795C53656E736F724875625F5032315C737263
 5C636870705C636C69656E74732E630000000025643A25
@@ -706,7 +706,7 @@
 21FEF75DF80AE03246294625F420F40120787032462068
 3946FEF718F8012003B0F0BD25643A2564094F4F4D2061
 742025733A25640A00633A5C77735C626F645F34373736
-31303539335F3534303434325C637573746F6D6572735C
+31303738335F3534323934315C637573746F6D6572735C
 676F6F676C655C503231466C61677461696C6D63755C64
 656C69766572795C53656E736F724875625F5032315C73
 72635C636870705C73657276696365735C6C6F6F706261
@@ -718,8 +718,8 @@
 0122460E2000908F200FF2B0010FF4C3F32868314604B0
 BDE870400E22FDF78CBF10B58B880124012B02D1FFF7BE
 FF00E00024204610BD25643A2564094F4F4D2061742025
-733A25640A00633A5C77735C626F645F34373736313035
-39335F3534303434325C637573746F6D6572735C676F6F
+733A25640A00633A5C77735C626F645F34373736313037
+38335F3534323934315C637573746F6D6572735C676F6F
 676C655C503231466C61677461696C6D63755C64656C69
 766572795C53656E736F724875625F5032315C7372635C
 636870705C73657276696365735C74696D6573796E632E
@@ -734,7 +734,7 @@
 314603B0BDE8F043FDF7E2BE10B58A880124012A02D1FF
 F7BAFF00E00024204610BD25643A2564094F4F4D206174
 2025733A25640A00633A5C77735C626F645F3437373631
-303539335F3534303434325C637573746F6D6572735C67
+303738335F3534323934315C637573746F6D6572735C67
 6F6F676C655C503231466C61677461696C6D63755C6465
 6C69766572795C53656E736F724875625F5032315C7372
 635C636870705C73657276696365735C646973636F7665
@@ -761,7 +761,7 @@
 05CDE90445AD230FF2AC118F200FF4D8F106B0BDE87083
 70B50446084615461E46FFF7BEFF3246294620680068BD
 E87040FDF797BD00000000633A5C77735C626F645F3437
-373631303539335F3534303434325C637573746F6D6572
+373631303738335F3534323934315C637573746F6D6572
 735C676F6F676C655C503231466C61677461696C6D6375
 5C64656C69766572795C53656E736F724875625F503231
 5C7372635C636870705C73657276696365732E63000000
@@ -788,8 +788,8 @@
 230FF240020FF22C018E2007E001A8009042230FF22C02
 0FF218018F200FF49DF00DF5027D10BC5DF80CFB0FF284
 014160704725643A25640950414C3A2025730A0000633A
-5C77735C626F645F3437373631303539335F3534303434
-325C637573746F6D6572735C676F6F676C655C50323146
+5C77735C626F645F3437373631303738335F3534323934
+315C637573746F6D6572735C676F6F676C655C50323146
 6C61677461696C6D63755C64656C69766572795C53656E
 736F724875625F5032315C7372635C636870705C706C61
 74666F726D5C70616C5F6170692E6300000000000001C9
@@ -848,7 +848,7 @@
 32BD13460A4601460248007810F469B000001453890055
 47800065478000687B890060D09100354780002B488000
 436870704C696E6B5461736B00000000633A5C77735C62
-6F645F3437373631303539335F3534303434325C637573
+6F645F3437373631303738335F3534323934315C637573
 746FF19403D04A80006D6572735C676F6F676C655C5032
 31466C61677461696C6D63755C64656C69766572795C53
 656E736F724875625F5032315C7372635C636870705C70
@@ -914,7 +914,7 @@
 0023002240F293210FF2380001B0BDE83040FBF732BB31
 BD0000D088890025643A256409474E5353207365727669
 636520616C7265616479206F70656E0A00000000633A5C
-77735C626F645F3437373631303539335F353430343432
+77735C626F645F3437373631303738335F353432393431
 5C637573746F6D6572735C676F6F676C655C503231466C
 61677461696C6D63755C64656C69766572795C53656E73
 6F724875625F5032315C7372635C636870705C73657276
@@ -965,7 +965,7 @@
 0023002295210FF23000FBF7EFF836B90023002296210F
 F22000FBF7E7F83620FEF78EF9286030B1811D2046FFF7
 99FF36203060012070BD633A5C77735C626F645F343737
-3631303539335F3534303434325C637573746F6D657273
+3631303738335F3534323934315C637573746F6D657273
 5C676F6F676C655C503231466C61677461696C6D63755C
 64656C69766572795C53656E736F724875625F5032315C
 7372635C636870705C636F6D6D6F6E5C676E73735F63F1
@@ -1020,7 +1020,7 @@
 0025643A2564095B25735D204D6561737572656D656E74
 2064617461206576656E74203A206D6561737572656D65
 6E745F636F756E74203D20282564290A000000633A5C77
-735C626F645F3437373631303539335F3534303434325C
+735C626F645F3437373631303738335F3534323934315C
 637573746F6D6572735C676F6F676C655C503231466C61
 677461696C6D63755C64656C69766572795C53656E736F
 724875625F5032315C7372635C636870705C706C617466
@@ -1229,9 +1229,9 @@
 8891FBF0F111FB00F008E0B08838B1A88070BD00291CBF
 F088002800D0A08070BD0B480170704700000948007870
 4700000848017070470000064800787047000001484161
-70470000787B89001A3F080099CB91009ACB91002F2F64
+70470000787B8900DD48080099CB91009ACB91002F2F64
 65706F742F636C69656E742F636F72652F72656C2F476F
-6F676C652F4D32322F542D4652432F2E2E2E000000007E
+6F676C652F5032322F3534303239362F2E2E2E0000007E
 24247E5056542044756D70203A20474C4C207665722E20
 256C7520666C61677461696C3A25730A000000007E2424
 7E5056542044756D70203A2054203D20256C752C204E54
diff --git a/init.insmod.sh b/init.insmod.sh
index 97ae7bc..645391a 100755
--- a/init.insmod.sh
+++ b/init.insmod.sh
@@ -51,6 +51,8 @@
   # to unblock early-boot trigger
   setprop vendor.common.modules.ready
   setprop vendor.device.modules.ready
+  setprop vendor.all.modules.ready
+  setprop vendor.all.devices.ready
   exit 1
 fi
 
diff --git a/manifest_64.xml b/manifest_64.xml
index 09466c9..2190686 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -44,15 +44,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format = "hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 4497748..a41d088 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -25,6 +25,7 @@
 using android::hardware::google::pixel::SysfsCollector;
 using android::hardware::google::pixel::UeventListener;
 
+#define BLOCK_STATS_LENGTH 17
 #define UFSHC_PATH(filename) "/dev/sys/block/bootdevice/" #filename
 #define UFS_ERR_PATH(err_type) UFSHC_PATH(err_stats/) #err_type
 const struct SysfsCollector::SysfsPaths sysfs_paths = {