diff --git a/proprietary/etc/permissions/com.qualcomm.location.xml b/proprietary/etc/permissions/com.qualcomm.location.xml
index 13ffef9..79d7408 100644
--- a/proprietary/etc/permissions/com.qualcomm.location.xml
+++ b/proprietary/etc/permissions/com.qualcomm.location.xml
@@ -10,11 +10,12 @@
 
 <permissions>
 
+<library name="com.android.services" file="/system/framework/services.jar"/>
+
 <permission name="com.qualcomm.permission.IZAT" >
     <group gid="gps" />
     <group gid="system" />
     <group gid="diag" />
-    <group gid="oem_2950" />
     <group gid="sdcard_rw" />
     <group gid="media_rw" />
     <group gid="wifi" />
diff --git a/proprietary/framework/com.qti.location.sdk.jar b/proprietary/framework/com.qti.location.sdk.jar
index 991814a..5021821 100644
Binary files a/proprietary/framework/com.qti.location.sdk.jar and b/proprietary/framework/com.qti.location.sdk.jar differ
diff --git a/proprietary/framework/izat.xt.srv.jar b/proprietary/framework/izat.xt.srv.jar
index c5b8b6d..2185f84 100644
Binary files a/proprietary/framework/izat.xt.srv.jar and b/proprietary/framework/izat.xt.srv.jar differ
diff --git a/proprietary/lib64/liblocationservice_jni.so b/proprietary/lib64/liblocationservice_jni.so
index e342423..8de73b3 100644
Binary files a/proprietary/lib64/liblocationservice_jni.so and b/proprietary/lib64/liblocationservice_jni.so differ
diff --git a/proprietary/lib64/libxt_native.so b/proprietary/lib64/libxt_native.so
index ce80a98..bf1bb9c 100644
Binary files a/proprietary/lib64/libxt_native.so and b/proprietary/lib64/libxt_native.so differ
diff --git a/proprietary/lib64/vendor.qti.gnss@1.1.so b/proprietary/lib64/vendor.qti.gnss@1.1.so
new file mode 100644
index 0000000..1df4647
Binary files /dev/null and b/proprietary/lib64/vendor.qti.gnss@1.1.so differ
diff --git a/proprietary/lib64/vendor.qti.gnss@1.2.so b/proprietary/lib64/vendor.qti.gnss@1.2.so
new file mode 100644
index 0000000..6581820
Binary files /dev/null and b/proprietary/lib64/vendor.qti.gnss@1.2.so differ
diff --git a/proprietary/lib64/vendor.qti.gnss@2.0.so b/proprietary/lib64/vendor.qti.gnss@2.0.so
new file mode 100644
index 0000000..2e1d1ab
Binary files /dev/null and b/proprietary/lib64/vendor.qti.gnss@2.0.so differ
diff --git a/proprietary/lib64/vendor.qti.gnss@2.1.so b/proprietary/lib64/vendor.qti.gnss@2.1.so
new file mode 100644
index 0000000..e710583
Binary files /dev/null and b/proprietary/lib64/vendor.qti.gnss@2.1.so differ
diff --git a/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk b/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
index 7555e38..5032074 100644
Binary files a/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk and b/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.gnss@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.gnss@1.0-service
old mode 100644
new mode 100755
index e466dc8..e1775f3
Binary files a/proprietary/vendor/bin/hw/vendor.qti.gnss@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.gnss@1.0-service differ
diff --git a/proprietary/vendor/bin/loc_launcher b/proprietary/vendor/bin/loc_launcher
index 48a2bbb..fca99f0 100755
Binary files a/proprietary/vendor/bin/loc_launcher and b/proprietary/vendor/bin/loc_launcher differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index 727c0bb..3bfac38 100755
Binary files a/proprietary/vendor/bin/lowi-server and b/proprietary/vendor/bin/lowi-server differ
diff --git a/proprietary/vendor/bin/slim_daemon b/proprietary/vendor/bin/slim_daemon
index 8176602..259ad43 100755
Binary files a/proprietary/vendor/bin/slim_daemon and b/proprietary/vendor/bin/slim_daemon differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index cbef09e..2b18c61 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc
index 7f43702..4643dfc 100644
--- a/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc
+++ b/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc
@@ -1,4 +1,4 @@
-service vendor.qti_gnss_service /vendor/bin/hw/vendor.qti.gnss@1.0-service
+service qti_gnss_service /vendor/bin/hw/vendor.qti.gnss@1.0-service
     class hal
     user gps
     group system gps radio
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so
index 8120483..c496305 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/libDRPlugin.so b/proprietary/vendor/lib64/libDRPlugin.so
index 4434411..9bb865c 100644
Binary files a/proprietary/vendor/lib64/libDRPlugin.so and b/proprietary/vendor/lib64/libDRPlugin.so differ
diff --git a/proprietary/vendor/lib64/libalarmservice_jni.so b/proprietary/vendor/lib64/libalarmservice_jni.so
index 3fd9c74..61646c1 100644
Binary files a/proprietary/vendor/lib64/libalarmservice_jni.so and b/proprietary/vendor/lib64/libalarmservice_jni.so differ
diff --git a/proprietary/vendor/lib64/libdataitems.so b/proprietary/vendor/lib64/libdataitems.so
index 517b8c1..e78a659 100644
Binary files a/proprietary/vendor/lib64/libdataitems.so and b/proprietary/vendor/lib64/libdataitems.so differ
diff --git a/proprietary/vendor/lib64/libdrplugin_client.so b/proprietary/vendor/lib64/libdrplugin_client.so
index 9a0a17a..6e929cb 100644
Binary files a/proprietary/vendor/lib64/libdrplugin_client.so and b/proprietary/vendor/lib64/libdrplugin_client.so differ
diff --git a/proprietary/vendor/lib64/libevent_observer.so b/proprietary/vendor/lib64/libevent_observer.so
index 2fddee3..78b8468 100644
Binary files a/proprietary/vendor/lib64/libevent_observer.so and b/proprietary/vendor/lib64/libevent_observer.so differ
diff --git a/proprietary/vendor/lib64/libflp.so b/proprietary/vendor/lib64/libflp.so
index ab90ceb..fa11976 100644
Binary files a/proprietary/vendor/lib64/libflp.so and b/proprietary/vendor/lib64/libflp.so differ
diff --git a/proprietary/vendor/lib64/libgdtap.so b/proprietary/vendor/lib64/libgdtap.so
index 3e75057..de640cb 100644
Binary files a/proprietary/vendor/lib64/libgdtap.so and b/proprietary/vendor/lib64/libgdtap.so differ
diff --git a/proprietary/vendor/lib64/libgeofence.so b/proprietary/vendor/lib64/libgeofence.so
index 3e3b29a..add7755 100644
Binary files a/proprietary/vendor/lib64/libgeofence.so and b/proprietary/vendor/lib64/libgeofence.so differ
diff --git a/proprietary/vendor/lib64/libizat_client_api.so b/proprietary/vendor/lib64/libizat_client_api.so
index 6d81863..db75cc7 100644
Binary files a/proprietary/vendor/lib64/libizat_client_api.so and b/proprietary/vendor/lib64/libizat_client_api.so differ
diff --git a/proprietary/vendor/lib64/libizat_core.so b/proprietary/vendor/lib64/libizat_core.so
index 76e5a94..08bc718 100644
Binary files a/proprietary/vendor/lib64/libizat_core.so and b/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index 16c19af..8625ee2 100644
Binary files a/proprietary/vendor/lib64/liblbs_core.so and b/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/proprietary/vendor/lib64/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 16d3576..514b5e7 100644
Binary files a/proprietary/vendor/lib64/libloc_api_v02.so and b/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/proprietary/vendor/lib64/libloc_ds_api.so b/proprietary/vendor/lib64/libloc_ds_api.so
index 37cd9d2..c9937a8 100644
Binary files a/proprietary/vendor/lib64/libloc_ds_api.so and b/proprietary/vendor/lib64/libloc_ds_api.so differ
diff --git a/proprietary/vendor/lib64/libloc_externalDr.so b/proprietary/vendor/lib64/libloc_externalDr.so
index 3133b11..ad82f5c 100644
Binary files a/proprietary/vendor/lib64/libloc_externalDr.so and b/proprietary/vendor/lib64/libloc_externalDr.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice.so b/proprietary/vendor/lib64/liblocationservice.so
index 2272e7b..fc202ef 100644
Binary files a/proprietary/vendor/lib64/liblocationservice.so and b/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice_glue.so b/proprietary/vendor/lib64/liblocationservice_glue.so
index bc09fb9..543db66 100644
Binary files a/proprietary/vendor/lib64/liblocationservice_glue.so and b/proprietary/vendor/lib64/liblocationservice_glue.so differ
diff --git a/proprietary/vendor/lib64/liblowi_client.so b/proprietary/vendor/lib64/liblowi_client.so
index 27eded3..894c131 100644
Binary files a/proprietary/vendor/lib64/liblowi_client.so and b/proprietary/vendor/lib64/liblowi_client.so differ
diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so
index 875d8b2..280adca 100644
Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and b/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/proprietary/vendor/lib64/libquipc_os_api.so b/proprietary/vendor/lib64/libquipc_os_api.so
index 715ae77..855505e 100644
Binary files a/proprietary/vendor/lib64/libquipc_os_api.so and b/proprietary/vendor/lib64/libquipc_os_api.so differ
diff --git a/proprietary/vendor/lib64/libulp2.so b/proprietary/vendor/lib64/libulp2.so
index 0729c8c..f2dd0fe 100644
Binary files a/proprietary/vendor/lib64/libulp2.so and b/proprietary/vendor/lib64/libulp2.so differ
diff --git a/proprietary/vendor/lib64/libxtadapter.so b/proprietary/vendor/lib64/libxtadapter.so
index 3876a0f..28cd7ab 100644
Binary files a/proprietary/vendor/lib64/libxtadapter.so and b/proprietary/vendor/lib64/libxtadapter.so differ
diff --git a/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so b/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so
index d46a3e9..2c2f905 100644
Binary files a/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so and b/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.0-impl.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.0-impl.so
deleted file mode 100644
index 8055886..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.0_vendor.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so
similarity index 98%
rename from proprietary/vendor/lib64/vendor.qti.gnss@1.0_vendor.so
rename to proprietary/vendor/lib64/vendor.qti.gnss@1.0.so
index 30787dd..5286dcf 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.0_vendor.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so differ
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index 2d3c633..61b1873 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -774,9 +774,13 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sanders/proprietary/vendor/lib/libulp2.so:system/vendor/lib/libulp2.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/libulp2.so:system/vendor/lib64/libulp2.so \
     vendor/motorola/sanders/proprietary/lib64/vendor.qti.gnss@1.0.so:system/lib64/vendor.qti.gnss@1.0.so \
+    vendor/motorola/sanders/proprietary/lib64/vendor.qti.gnss@1.1.so:system/lib64/vendor.qti.gnss@1.1.so \
+    vendor/motorola/sanders/proprietary/lib64/vendor.qti.gnss@1.2.so:system/lib64/vendor.qti.gnss@1.2.so \
+    vendor/motorola/sanders/proprietary/lib64/vendor.qti.gnss@2.0.so:system/lib64/vendor.qti.gnss@2.0.so \
+    vendor/motorola/sanders/proprietary/lib64/vendor.qti.gnss@2.1.so:system/lib64/vendor.qti.gnss@2.1.so \
+    vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so:system/vendor/lib64/vendor.qti.gnss@1.0.so \
     vendor/motorola/sanders/proprietary/lib64/vendor.qti.hardware.iop@1.0.so:system/lib64/vendor.qti.hardware.iop@1.0.so \
     vendor/motorola/sanders/proprietary/lib64/vendor.qti.hardware.perf@1.0.so:system/lib64/vendor.qti.hardware.perf@1.0.so \
-    vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.gnss@1.0-impl.so:system/vendor/lib64/vendor.qti.gnss@1.0-impl.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0-impl.so:system/vendor/lib64/vendor.qti.hardware.iop@1.0-impl.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so:system/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so:system/vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so \
@@ -1180,7 +1184,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sanders/proprietary/vendor/lib64/libcneoplookup.so:system/vendor/lib64/libcneoplookup.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/libcneqmiutils.so:system/vendor/lib64/libcneqmiutils.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/libperfgluelayer.so:system/vendor/lib64/libperfgluelayer.so \
-    vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.gnss@1.0_vendor.so:system/vendor/lib64/vendor.qti.gnss@1.0_vendor.so \
     vendor/motorola/sanders/proprietary/vendor/lib/libOmxAmrDec.so:system/vendor/lib/libOmxAmrDec.so \
     vendor/motorola/sanders/proprietary/vendor/lib/libOmxDsdDec.so:system/vendor/lib/libOmxDsdDec.so \
     vendor/motorola/sanders/proprietary/vendor/lib/libOmxVpp.so:system/vendor/lib/libOmxVpp.so \