diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index eabf6dd5..be54bc27 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -328,10 +328,6 @@ on init
     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
 
@@ -473,13 +469,6 @@ on early-boot
     # 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
 
diff --git a/device-shipping-common.mk b/device-shipping-common.mk
index 49897aa1..a4539fc1 100644
--- a/device-shipping-common.mk
+++ b/device-shipping-common.mk
@@ -18,5 +18,5 @@ include device/google/gs101/device-common.mk
 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/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index 9c49907e..eeb4caa4 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -82,6 +82,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole
index 45ece4d3..f2489f7a 100644
--- a/gnss/47765/config/gps.xml.oriole
+++ b/gnss/47765/config/gps.xml.oriole
@@ -82,6 +82,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven
index b7331776..dc8ea187 100644
--- a/gnss/47765/config/gps.xml.raven
+++ b/gnss/47765/config/gps.xml.raven
@@ -82,6 +82,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml
index 9e1a2463..a752fa17 100644
--- a/gnss/47765/config/gps_user.xml
+++ b/gnss/47765/config/gps_user.xml
@@ -81,6 +81,7 @@
 
        EnableOnChipStopNotification="false"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole
index ffdabeb8..0495378d 100644
--- a/gnss/47765/config/gps_user.xml.oriole
+++ b/gnss/47765/config/gps_user.xml.oriole
@@ -81,6 +81,7 @@
 
        EnableOnChipStopNotification="false"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven
index 6200fc21..fd031b64 100644
--- a/gnss/47765/config/gps_user.xml.raven
+++ b/gnss/47765/config/gps_user.xml.raven
@@ -81,6 +81,7 @@
 
        EnableOnChipStopNotification="false"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/init.insmod.sh b/init.insmod.sh
index 97ae7bcb..645391af 100755
--- a/init.insmod.sh
+++ b/init.insmod.sh
@@ -51,6 +51,8 @@ else
   # 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