diff --git a/device.mk b/device.mk
index 3dd5a85..7e95254 100644
--- a/device.mk
+++ b/device.mk
@@ -847,8 +847,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.1.brightness.dimming.usage?
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.sys.sf.native_mode=2
-PRODUCT_COPY_FILES += \
-	device/google/zumapro/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb
 
 # limit DPP downscale ratio
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=4
diff --git a/display/display_colordata_cal0.pb b/display/display_colordata_cal0.pb
deleted file mode 100644
index 9840d6a..0000000
Binary files a/display/display_colordata_cal0.pb and /dev/null differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2678633..cb3e540 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -321,6 +321,12 @@
     <!-- Telephony satellite service package name to bind to by default. -->
     <string name="config_satellite_service_package">com.google.android.satellite</string>
 
+    <!-- The time duration in millis after which Telephony will stop waiting for the response of the
+         satellite enable request from modem, and send failure response to the client that has
+         requested Telephony to enable satellite.
+         -->
+    <integer name="config_wait_for_satellite_enabling_response_timeout_millis">240000</integer>
+
     <!-- Telephony pointing UI package name to be launched. -->
     <string name="config_pointing_ui_package">com.google.android.apps.scone</string>
 
@@ -519,6 +525,9 @@
     <!-- The intent action to handle oem-enabled satellite SOS messaging. -->
     <string name="config_satellite_emergency_handover_intent_action">com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE</string>
 
+    <!-- The intent action to handle oem-enabled satellite demo mode SOS messaging. -->
+    <string name="config_satellite_demo_mode_sos_intent_action">com.google.android.apps.stargate.ACTION_ESOS_DEMO</string>
+
     <!-- User activity timeout: Maximum screen dim duration in milliseconds. -->
     <integer name="config_maximumScreenDimDuration">20000</integer>