diff --git a/location/gps.xml b/location/gps.xml
index 687585f..8955883 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -49,8 +49,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 27dc2b6..e2404a3 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -49,8 +49,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 1dbb46c..a2c9baf 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -49,8 +49,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 8a73858..713c43b 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -48,8 +48,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index df40074..015ea13 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -48,8 +48,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 13cbe4e..f12eecc 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -48,8 +48,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"