diff --git a/device-husky.mk b/device-husky.mk
index bd97283..566ea2b 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -528,7 +528,10 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+
+ifneq ($(wildcard vendor/arm/mali/valhall),)
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
+endif
 
 # Bluetooth device id
 # Husky: 0x410D
diff --git a/device-shiba.mk b/device-shiba.mk
index e5a6721..5cd1c6f 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -497,7 +497,10 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+
+ifneq ($(wildcard vendor/arm/mali/valhall),)
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
+endif
 
 # Bluetooth device id
 # Shiba: 0x410E
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 6ac9dd9..6421033 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -64,11 +64,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 6feb00e..d29bf7e 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -64,11 +64,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index c499491..2451057 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -62,11 +62,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 2534981..7968386 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -62,11 +62,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"