diff --git a/device.mk b/device.mk
index 818db1c..726a132 100644
--- a/device.mk
+++ b/device.mk
@@ -37,4 +37,11 @@ PRODUCT_COPY_FILES := \
 	device/zuk/z2_row/keylayout/qpnp_pon.kl:system/usr/keylayout/acdbdata/qpnp_pon.kl \
 	device/zuk/z2_row/keylayout/synaptics.kl:system/usr/keylayout/acdbdata/synaptics.kl
 
+# GPS
+PRODUCT_COPY_FILES := \
+	device/zuk/z2_row/gps/flp.conf:system/etc/flp.conf \
+	device/zuk/z2_row/gps/gps.conf:system/etc/gps.conf \
+	device/zuk/z2_row/gps/izat.conf:system/etc/izat.conf \
+	device/zuk/z2_row/gps/sap.conf:system/etc/sap.conf
+
 $(call inherit-product-if-exists, vendor/zuk/z2_row/z2_row-vendor.mk)
diff --git a/gps/flp.conf b/gps/flp.conf
index 9665d79..7d6002f 100644
--- a/gps/flp.conf
+++ b/gps/flp.conf
@@ -12,7 +12,7 @@
 # of batched locations that can be allocated,
 # which is limited by memory. The default
 # batch size defined as 20 as below.
-BATCH_SIZE=40
+BATCH_SIZE=20
 
 ###################################
 # FLP BATCHING SESSION TIMEOUT
diff --git a/gps/gps.conf b/gps/gps.conf
index 05e8d9c..a06cdb4 100644
--- a/gps/gps.conf
+++ b/gps/gps.conf
@@ -1,8 +1,15 @@
 #Uncommenting these urls would only enable
 #the power up auto injection and force injection(test case).
-XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin
-XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin
-XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin
+#XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin
+#XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin
+#XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin
+
+#ifdef VENDOR_EDIT 
+# zuoyonghua@oneplus.cn add gps xtra server for speed up gps cold start 
+XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra3grc.bin 
+XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra3grc.bin 
+XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra3grc.bin 
+#endif
 
 #Version check for XTRA
 #DISABLE = 0
@@ -98,7 +105,7 @@ CAPABILITIES=0x37
 # 1: Enable LPP_User_Plane on LTE
 # 2: Enable LPP_Control_Plane
 # 3: Enable both LPP_User_Plane and LPP_Control_Plane
-LPP_PROFILE = 3
+LPP_PROFILE = 2
 
 ################################
 # EXTRA SETTINGS
@@ -114,4 +121,8 @@ SGLTE_TARGET=0
 # 0x1: RRC CPlane
 # 0x2: RRLP UPlane
 # 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
+#ifndef zuoyonghua@oneplus.cn enable all bit mask for GLONASS
+#A_GLONASS_POS_PROTOCOL_SELECT = 0
+#else 
+A_GLONASS_POS_PROTOCOL_SELECT = 15
+#endif
diff --git a/gps/izat.conf b/gps/izat.conf
index f788395..1877099 100644
--- a/gps/izat.conf
+++ b/gps/izat.conf
@@ -27,7 +27,7 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 # QNP when the EULA is not consented to by the user. QNP can
 # still return ZPP locations or injected locations even
 # without EULA consent, but the uncertainty can be high.
-NLP_MODE = 3
+NLP_MODE = 1
 NLP_TOLERANCE_TIME_FIRST = 5000
 NLP_TOLERANCE_TIME_AFTER = 20000
 NLP_THRESHOLD = 3
@@ -67,12 +67,12 @@ GTP_CELL_PROC=MODEM
 #GTP_CELL valid modes:
 # DISABLED
 # BASIC
-GTP_CELL=BASIC
+GTP_CELL=DISABLED
 
 #GTP_WIFI valid modes:
 # DISABLED
 # BASIC
-GTP_WIFI=BASIC
+GTP_WIFI=DISABLED
 
 #GTP_WAA valid modes:
 # DISABLED
@@ -88,22 +88,22 @@ SAP=BASIC
 #ODCPI valid modes:
 #DISABLED
 #BASIC
-ODCPI=BASIC
+ODCPI=DISABLED
 
 #FREE_WIFI_SCAN_INJECT valid modes:
 #DISABLED
 #BASIC
-FREE_WIFI_SCAN_INJECT=BASIC
+FREE_WIFI_SCAN_INJECT=DISABLED
 
 #SUPL_WIFI valid modes:
 #DISABLED
 #BASIC
-SUPL_WIFI=BASIC
+SUPL_WIFI=DISABLED
 
 #WIFI_SUPPLICANT_INFO valid modes:
 #DISABLED
 #BASIC
-WIFI_SUPPLICANT_INFO=BASIC
+WIFI_SUPPLICANT_INFO=DISABLED
 
 #####################################
 # Location process launcher settings
@@ -126,11 +126,13 @@ WIFI_SUPPLICANT_INFO=BASIC
 
 #Values for PLATFORMS can be:
 #1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226
-#2. all -> for All platforms
+#2. 'all' or 'all exclude' -> for All platforms
+#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937
 
 #Values for BASEBAND can be:
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
-#2. all -> for all basebands
+#2. 'all' or 'all exclude' -> for all basebands
+#3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
 
 #Valyes for LEAN_TARGETS can be:
 #ENABLED  -> if this process is supposed to run on lean and mean targets
diff --git a/gps/quipc.conf b/gps/quipc.conf
deleted file mode 100644
index 94f96ac..0000000
--- a/gps/quipc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# X86 ONLY - UBUNTU:
-# Set QUIPC_CONF_PATH environment variable to indicate the path of this file, e.g:
-#   export QUIPC_CONF_PATH="/usr2/arahmat/quipc.conf"
-
-# URL for QUIPS server (N3)
-QUIPS_SERVER_URL = https://n3.indoor.izat-location.net/quipsds/LookupService
-
-# URL for RAS server
-RAS_SERVER_URL = https://r1.indoor.izat-location.net/ras/DeviceRegistration
-
-# Password for secured MSAP-enabled AP
-SSID_PWD = qu1pspsk
diff --git a/gps/sap.conf b/gps/sap.conf
index 2a19917..3e5b508 100644
--- a/gps/sap.conf
+++ b/gps/sap.conf
@@ -27,7 +27,7 @@ SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
 
 # Sensor Control Mode (0=AUTO, 1=FORCE_ON)
 # used in loc_eng_reinit
-SENSOR_CONTROL_MODE=0
+SENSOR_CONTROL_MODE=1
 
 # Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
 # used in loc_eng_reinit
@@ -40,7 +40,7 @@ SENSOR_PROVIDER=1
 # Setting each bit has the following definition:
 #  0x1 - DISABLE_INS_POSITIONING_FILTER
 #  0x0 - ENABLE_INS_POSITIONING_FILTER
-SENSOR_ALGORITHM_CONFIG_MASK=0x0
+SENSOR_ALGORITHM_CONFIG_MASK=0x00
 
 # Time source used by Sensor HAL
 # Setting this value controls accuracy of location sensor services.
diff --git a/product/android.mk b/product/android.mk
deleted file mode 100644
index a1ca561..0000000
--- a/product/android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# First api level, device has been commercially launched
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.product.first_api_level=22
diff --git a/product/browser.mk b/product/browser.mk
deleted file mode 100644
index 274bd9f..0000000
--- a/product/browser.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Gello
-PRODUCT_PACKAGES += \
-    Gello
diff --git a/product/display.mk b/product/display.mk
deleted file mode 100644
index f7cc2b5..0000000
--- a/product/display.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Boot animation
-TARGET_SCREEN_HEIGHT := 1280
-TARGET_SCREEN_WIDTH := 720
-
-# Panel
-PRODUCT_PACKAGES += \
-    pp_calib_data_booyi_OTM1287_720p_video_mode_dsi_panel.xml
-
-# Screen density
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=320
-
-PRODUCT_AAPT_CONFIG := normal
-PRODUCT_AAPT_PREF_CONFIG := xhdpi
-
-$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)
diff --git a/product/init.mk b/product/init.mk
deleted file mode 100644
index 079fd18..0000000
--- a/product/init.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Init scripts
-PRODUCT_PACKAGES += \
-    fstab.qcom \
-    init.target.rc
diff --git a/product/keylayouts.mk b/product/keylayouts.mk
deleted file mode 100644
index 5b00639..0000000
--- a/product/keylayouts.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Keylayout
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
-    $(LOCAL_PATH)/keylayout/qpnp_pon.kl:system/usr/keylayout/qpnp_pon.kl
diff --git a/product/lights.mk b/product/lights.mk
deleted file mode 100644
index 0514fd3..0000000
--- a/product/lights.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lights
-PRODUCT_PACKAGES += \
-    lights.msm8916
diff --git a/product/media.mk b/product/media.mk
deleted file mode 100644
index e6ad64c..0000000
--- a/product/media.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Media
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \
-    $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
diff --git a/product/partitions.mk b/product/partitions.mk
deleted file mode 100644
index cfb20b2..0000000
--- a/product/partitions.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Factory reset protection
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.frp.pst=/dev/block/bootdevice/by-name/frp
diff --git a/product/qcom-audio.mk b/product/qcom-audio.mk
deleted file mode 100644
index 60cb1d6..0000000
--- a/product/qcom-audio.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Audio
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/audio/acdb/QRD_Bluetooth_cal.acdb:system/etc/acdbdata/QRD/QRD_Bluetooth_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_General_cal.acdb:system/etc/acdbdata/QRD/QRD_General_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_Global_cal.acdb:system/etc/acdbdata/QRD/QRD_Global_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_Handset_cal.acdb:system/etc/acdbdata/QRD/QRD_Handset_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_Hdmi_cal.acdb:system/etc/acdbdata/QRD/QRD_Hdmi_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_Headset_cal.acdb:system/etc/acdbdata/QRD/QRD_Headset_cal.acdb \
-    $(LOCAL_PATH)/audio/acdb/QRD_Speaker_cal.acdb:system/etc/acdbdata/QRD/QRD_Speaker_cal.acdb \
-    $(LOCAL_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml \
-    $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
-    $(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths_qrd_skui.xml
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
-
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.qc.sdk.audio.fluencetype=fluence \
-    persist.audio.fluence.voicecall=true \
-    persist.audio.fluence.voicerec=false \
-    persist.audio.fluence.speaker=false
diff --git a/product/qcom-camera.mk b/product/qcom-camera.mk
deleted file mode 100644
index 7be729a..0000000
--- a/product/qcom-camera.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Camera
-PRODUCT_PACKAGES += \
-    camera.msm8916 \
-    libmm-qcamera \
-    Snap
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
-    frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml
-
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.camera.cpp.duplication=false \
-    persist.camera.hal.debug.mask=0
diff --git a/product/qcom-cne.mk b/product/qcom-cne.mk
deleted file mode 100644
index 1e95895..0000000
--- a/product/qcom-cne.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# CNE
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.cne.feature=1 \
-    persist.dpm.feature=7
diff --git a/product/qcom-gps.mk b/product/qcom-gps.mk
deleted file mode 100644
index 1b9b020..0000000
--- a/product/qcom-gps.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# GPS
-PRODUCT_PACKAGES += \
-    gps.msm8916
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \
-    $(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \
-    $(LOCAL_PATH)/gps/izat.conf:system/etc/izat.conf \
-    $(LOCAL_PATH)/gps/quipc.conf:system/etc/quipc.conf \
-    $(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml
-
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.gps.qc_nlp_in_use=1 \
-    persist.loc.nlp_name=com.qualcomm.location \
-    ro.gps.agps_provider=1
diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk
deleted file mode 100644
index 2ea4750..0000000
--- a/product/qcom-radio.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.radio.multisim.config=dsds \
-    persist.radio.custom_ecc=1 \
-    persist.radio.ecc_hard_1=998 \
-    persist.radio.ecc_hard_count=1 \
-    rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \
-    ro.telephony.default_network=9,9
-
-# RIL
-ifeq ($(QCPATH),)
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/data/netmgr_config.xml:system/etc/data/netmgr_config.xml \
-    $(LOCAL_PATH)/configs/data/qmi_config.xml:system/etc/data/qmi_config.xml \
-    $(LOCAL_PATH)/configs/data/dsi_config.xml:system/etc/data/dsi_config.xml
-endif
diff --git a/product/qcom-wifi.mk b/product/qcom-wifi.mk
deleted file mode 100644
index 9cc6e81..0000000
--- a/product/qcom-wifi.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Wifi
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
-    $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
-    $(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
diff --git a/product/recovery.mk b/product/recovery.mk
deleted file mode 100644
index 3b895c9..0000000
--- a/product/recovery.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Recovery
-PRODUCT_EXTRA_RECOVERY_KEYS += \
-    $(LOCAL_PATH)/crackling-releasekey
diff --git a/product/sensors.mk b/product/sensors.mk
deleted file mode 100644
index ee16371..0000000
--- a/product/sensors.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Sensors
-PRODUCT_PACKAGES += \
-    accelcal \
-    AccCalibration \
-    sensord \
-    sensors.msm8916
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
-    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
-    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
-    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
-    frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
diff --git a/product/touchscreen.mk b/product/touchscreen.mk
deleted file mode 100644
index 8576ad5..0000000
--- a/product/touchscreen.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Touchscreen
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/display/synaptics_dsx_fw_update_boyi.bin:system/etc/firmware/synaptics_dsx_fw_update_boyi.bin
diff --git a/product/usb.mk b/product/usb.mk
deleted file mode 100644
index fa38a03..0000000
--- a/product/usb.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# USB ID
-ADDITIONAL_DEFAULT_PROPERTIES += \
-    ro.usb.id.midi=90BA \
-    ro.usb.id.midi_adb=90BB \
-    ro.usb.id.mtp=2281 \
-    ro.usb.id.mtp_adb=2282 \
-    ro.usb.id.ptp=2284 \
-    ro.usb.id.ptp_adb=2283 \
-    ro.usb.id.ums=2286 \
-    ro.usb.id.ums_adb=2285 \
-    ro.usb.vid=2970