Merge cherrypicks of [18797389, 19221742, 19267009, 19292868, 19293650] into sparse-8804744-L12000000955514047.
Change-Id: I537263454f75883203a2490cae75e0acbc303e12
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 5e46996..8e1c6a8 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -117,7 +117,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=6
+ ro.vendor.build.svn=10
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/gps.xml.b3 b/gps.xml.b3
index a6bbcfc..0879fa9 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -76,6 +76,7 @@
EnableOnChipStopNotification="2"
PowerMode="3"
+ MinGpsWeekNumber="2216"
/>
<gll_features
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index 686d7dd..6180512 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -75,6 +75,7 @@
EnableOnChipStopNotification="false"
PowerMode="3"
+ MinGpsWeekNumber="2216"
/>
<gll_features