diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 867f055..361007d 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 20cc957..5140964 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index aab98bf..ad2ed5a 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -187,6 +187,7 @@ isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
@@ -226,6 +227,7 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index b9ef10a..c325507 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -70,6 +70,7 @@ isForceHighAccuracyMode=1
 isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
@@ -106,6 +107,7 @@ ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index 971378c..6c53e48 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ