diff --git a/device-husky.mk b/device-husky.mk
index 9496a9c..ec4b899 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -53,7 +53,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layer
 
 PRODUCT_COPY_FILES += \
 	device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
-    device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb
+    device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb \
+    device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb
 
 CAMERA_PRODUCT ?= husky
 
diff --git a/device-shiba.mk b/device-shiba.mk
index da84aaa..716b2f7 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -339,7 +339,8 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/shiba/display_colordata_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-bigsurf_cal0.pb \
 	device/google/shusky/shiba/display_colordata_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-shoreline_cal0.pb \
     device/google/shusky/shiba/display_golden_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-bigsurf_cal0.pb \
-    device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb
+    device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb \
+    device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb
 
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/display_golden_external_display_cal2.pb b/display_golden_external_display_cal2.pb
new file mode 100644
index 0000000..a5e604b
Binary files /dev/null and b/display_golden_external_display_cal2.pb differ
diff --git a/location/gps.xml b/location/gps.xml
index 87ced9c..ae7cd4c 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"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 5eb541f..9fbfdf2 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -60,7 +60,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 17ad50d..ad1ac41 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -60,7 +60,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -93,6 +93,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml b/location/gps_user.xml
index b9331e6..292fa2b 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"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -92,6 +92,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index c72bfae..3a0f045 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -59,7 +59,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -92,6 +92,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 0375981..463fd07 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -59,7 +59,7 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
+       ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
        SensorsMask="0x244"
@@ -92,6 +92,8 @@
 
        EnableB1C="false"
        EnableCoex="true"
+
+       RTICacheTimeoutSec="3600"
   />
 
   <gll_features