diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 3625f0a3..34620e75 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -34,6 +34,11 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
 # Enable 64-bit for non-zygote.
 ZYGOTE_FORCE_64 := true
+
+# Force any prefer32 targets to be compiled as 64 bit.
+FORCE_MULTILIB_FIRST_ON_DEVICE := true
+
+# Build the 32 bit targets
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 60f2ab11..35d9cd66 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -320,10 +320,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 late-fs
     # Wait for keymaster HALs
     exec_start wait_for_keymaster
@@ -440,13 +436,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
 
@@ -948,6 +937,8 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/tz-by-name/skin_therm1/trip_point_0_hyst
     chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_hyst
     chown system system /dev/thermal/tz-by-name/usb_pwr_therm/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/usb_pwr_therm/trip_point_0_hyst
     chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote
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