Snap for 10750748 from 677fd9e8acd6cbebf0434a568614174da63c5c56 to mainline-cellbroadcast-release

Change-Id: I224af1d1a4176068c39be145649ff67fbc4badf2
diff --git a/device-felix.mk b/device-felix.mk
index c25c2e2..7bc7487 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -205,7 +205,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=21
+    ro.vendor.build.svn=25
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/location/gps.xml.f10 b/location/gps.xml.f10
index 6e005ae..3758532 100644
--- a/location/gps.xml.f10
+++ b/location/gps.xml.f10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10
index 02afd01..528cab0 100644
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"