wayne-common: Update from jasmine

* jasmine_sprout 9 PKQ1.180904.001 V10.0.9.0.PDIMIXM release-keys * Graphics SDM from LA.UM.7.4.r1-04100-8x98.0 Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn> Change-Id: I457f9d446b86b856e2cebe85b698403005c58d3e
2018-12-22 17:39:41 +01:00 · 2018-12-22 17:39:41 +01:00 · 440c138626
commit 440c138626
parent b7a234474d
23 changed files with 4424 additions and 2188 deletions
--- a/Android.mk
+++ b/Android.mk
@ -69,17 +69,6 @@ $(DSP_MOUNT_POINT):
 ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
 IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
 IMS_SYMLINKS := $(addprefix $(TARGET_OUT_APPS)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
 $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "IMS lib link: $@"
 	@mkdir -p $(dir $@)
 	@rm -rf $@
 	$(hide) ln -sf /system/lib64/$(notdir $@) $@
 ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
 RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/
 $(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "Creating RFS MSM ADSP folder structure: $@"
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@ -1,5 +1,4 @@
 <!-- Copyright (c) 2017, The Linux Foundation. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@ -12,7 +11,6 @@ met:
    * Neither the name of The Linux Foundation nor the names of its
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
@ -26,6 +24,14 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <compatibility-matrix version="1.0" type="device">
    <hal format="hidl" optional="false">
        <name>android.frameworks.displayservice</name>
        <version>1.0</version>
        <interface>
            <name>IDisplayService</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.frameworks.schedulerservice</name>
        <version>1.0</version>
@ -42,6 +48,22 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.hardware.graphics.composer</name>
        <version>2.1</version>
        <interface>
            <name>IComposer</name>
            <instance>vr</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.hardware.health</name>
        <version>2.0</version>
        <interface>
            <name>IHealth</name>
            <instance>backup</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.hidl.allocator</name>
        <version>1.0</version>
@ -52,7 +74,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </hal>
    <hal format="hidl" optional="false">
        <name>android.hidl.manager</name>
-        <version>1.0</version>
+        <version>1.1</version>
        <interface>
            <name>IServiceManager</name>
            <instance>default</instance>
@ -74,6 +96,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.system.net.netd</name>
        <version>1.1</version>
        <interface>
            <name>INetd</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="false">
        <name>android.system.wifi.keystore</name>
        <version>1.0</version>
@ -82,10 +112,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <vndk>
        <version>0.0.0</version>
    </vndk>
 </compatibility-matrix>
--- a/config.fs
+++ b/config.fs
@ -118,6 +118,18 @@ user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
 [vendor/bin/sensors.qti]
 mode: 0755
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 [system/vendor/bin/sensors.qti]
 mode: 0755
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 [vendor/bin/slim_daemon]
 mode: 0755
 user:  AID_GPS
--- a/manifest.xml
+++ b/manifest.xml
@ -113,15 +113,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        <version>1.1</version>
        <interface>
            <name>ICryptoFactory</name>
            <instance>clearkey</instance>
            <instance>default</instance>
            <instance>widevine</instance>
            <instance>clearkey</instance>
        </interface>
        <interface>
            <name>IDrmFactory</name>
            <instance>clearkey</instance>
            <instance>default</instance>
            <instance>widevine</instance>
            <instance>clearkey</instance>
        </interface>
        <fqname>@1.1::ICryptoFactory/clearkey</fqname>
        <fqname>@1.1::IDrmFactory/clearkey</fqname>
@ -143,6 +143,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <name>IGnss</name>
            <instance>default</instance>
        </interface>
        <fqname>@1.0::IGnss/gnss_vendor</fqname>
    </hal>
    <hal format="hidl">
        <name>android.hardware.graphics.allocator</name>
@ -241,7 +242,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <hal format="hidl">
        <name>android.hardware.radio</name>
        <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.2</version>
        <interface>
            <name>IRadio</name>
            <instance>slot1</instance>
@ -254,13 +255,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </interface>
    </hal>
    <hal format="hidl">
-        <name>android.hardware.radio.deprecated</name>
+        <name>android.hardware.radio.config</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
-            <name>IOemHook</name>
+            <name>IRadioConfig</name>
-            <instance>slot1</instance>
+            <instance>default</instance>
            <instance>slot2</instance>
        </interface>
    </hal>
    <hal format="hidl">
@ -425,7 +425,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <hal format="hidl">
        <name>com.qualcomm.qti.imscmservice</name>
        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>2.1</version>
        <interface>
            <name>IImsCmService</name>
            <instance>qti.ims.connectionmanagerservice</instance>
@ -434,12 +434,30 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <hal format="hidl">
        <name>com.qualcomm.qti.uceservice</name>
        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>2.0</version>
        <interface>
            <name>IUceService</name>
            <instance>com.qualcomm.qti.uceservice</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.quicinc.cne.api</name>
        <transport>hwbinder</transport>
        <version>1.1</version>
        <interface>
            <name>IApiService</name>
            <instance>cnd</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.quicinc.cne.server</name>
        <transport>hwbinder</transport>
        <version>2.2</version>
        <interface>
            <name>IServer</name>
            <instance>cnd</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.qualcomm.qti.wifidisplayhal</name>
        <transport>hwbinder</transport>
@ -453,33 +471,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>wifidisplayhdcphal</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.quicinc.cne.api</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IApiService</name>
            <instance>cnd</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.quicinc.cne.server</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IServer</name>
            <instance>cnd</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>com.quicinc.cne.server</name>
        <transport>hwbinder</transport>
        <version>2.0</version>
        <interface>
            <name>IServer</name>
            <instance>cnd</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.display.color</name>
        <transport>hwbinder</transport>
@ -516,6 +507,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.lineage.livedisplay</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IColor</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.lineage.power</name>
        <transport>hwbinder</transport>
@ -526,9 +526,36 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </interface>
    </hal>
    <hal format="hidl">
-        <name>vendor.qti.gnss</name>
+        <name>vendor.qti.data.factory</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IFactory</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.esepowermanager</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IEsePowerManager</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.gnss</name>
        <transport>hwbinder</transport>
        <version>1.2</version>
        <interface>
            <name>ILocHidlGnss</name>
            <instance>gnss_vendor</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.gnss</name>
        <transport>hwbinder</transport>
        <version>2.0</version>
        <interface>
            <name>ILocHidlGnss</name>
            <instance>gnss_vendor</instance>
@ -570,28 +597,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.qdutils_disp</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IQdutilsDisp</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.qteeconnector</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IAppConnector</name>
            <instance>default</instance>
        </interface>
        <interface>
            <name>IGPAppConnector</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.radio.am</name>
        <transport>hwbinder</transport>
@ -602,20 +607,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>slot2</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.radio.config</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IConfig</name>
            <instance>radioconfig0</instance>
            <instance>radioconfig1</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.radio.ims</name>
        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.4</version>
        <interface>
            <name>IImsRadio</name>
            <instance>imsradio0</instance>
@ -652,10 +647,20 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>slot2</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.radio.qtiradio</name>
        <transport>hwbinder</transport>
        <version>2.0</version>
        <interface>
            <name>IQtiRadio</name>
            <instance>slot1</instance>
            <instance>slot2</instance>
        </interface>
    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.radio.uim</name>
        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
        <interface>
            <name>IUim</name>
            <instance>Uim0</instance>
@ -683,11 +688,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </interface>
    </hal>
    <hal format="hidl">
-        <name>vendor.qti.hardware.tui_comm</name>
+        <name>vendor.qti.hardware.soter</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
-            <name>ITuiComm</name>
+            <name>ISoter</name>
            <instance>default</instance>
        </interface>
    </hal>
--- a/properties.mk
+++ b/properties.mk
@ -1,7 +1,6 @@
 # Audio
 PRODUCT_PROPERTY_OVERRIDES += \
    af.fast_track_multiplier=1 \
    audio.adm.buffering.ms=6 \
    audio.deep_buffer.media=true \
    audio.offload.min.duration.secs=30 \
    audio.offload.video=true \
@ -12,13 +11,16 @@ PRODUCT_PROPERTY_OVERRIDES += \
    persist.vendor.audio.fluence.voicecall=true \
    persist.vendor.audio.fluence.voicerec=false \
    persist.vendor.audio.hifi.int_codec=true \
    persist.vendor.audio.hw.binder.size_kbyte=1024 \
    persist.vendor.audio.ras.enabled=false \
    persist.vendor.bt.a2dp_offload_cap=sbc-aac \
    ro.af.client_heap_size_kbyte=7168 \
    ro.audio.soundfx.dirac=true \
    ro.config.vc_call_vol_steps=7 \
    ro.config.media_vol_steps=25 \
    ro.vendor.audio.sdk.fluencetype=fluence \
    ro.vendor.audio.sdk.ssr=false \
    vendor.audio.adm.buffering.ms=6 \
    vendor.audio.dolby.ds2.enabled=false \
    vendor.audio.dolby.ds2.hardbypass=false \
    vendor.audio.flac.sw.decoder.24bit=true \
@ -46,25 +48,26 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.bokeh.switch.lux=290 \
+    camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
-    persist.camera.depth.focus.cb=0 \
+    persist.vendor.bokeh.switch.lux=290 \
-    persist.camera.expose.aux=1 \
+    persist.vendor.camera.HAL3.enabled=0 \
-    persist.camera.isp.clock.optmz=0 \
+    persist.vendor.camera.depth.focus.cb=0 \
-    persist.camera.isp.turbo=1 \
+    persist.vendor.camera.exif.make=Xiaomi \
-    persist.camera.linkpreview=0 \
+    persist.vendor.camera.expose.aux=1 \
-    persist.camera.preview.ubwc=0 \
+    persist.vendor.camera.imglib.usefdlite=1 \
-    persist.camera.set.afd=4 \
+    persist.vendor.camera.isp.clock.optmz=0 \
-    persist.camera.stats.test=0 \
+    persist.vendor.camera.isp.turbo=1 \
-    persist.imx376_ofilm.light.lux=280 \
+    persist.vendor.camera.linkpreview=0 \
-    persist.imx376_ofilm.low.lux=310 \
+    persist.vendor.camera.preview.ubwc=0 \
-    persist.imx376_sunny.light.lux=280 \
+    persist.vendor.camera.stats.test=0 \
-    persist.imx376_sunny.low.lux=310 \
+    persist.vendor.imx376_ofilm.light.lux=275 \
-    vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
+    persist.vendor.imx376_ofilm.low.lux=290 \
-    video.disable.ubwc=1
+    persist.vendor.imx376_sunny.light.lux=275 \
    persist.vendor.imx376_sunny.low.lux=290 \
    vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi
 # Display
 PRODUCT_PROPERTY_OVERRIDES += \
    debug.gralloc.enable_fb_ubwc=1 \
    debug.sf.enable_hwc_vds=1 \
    debug.sf.hw=1 \
    debug.sf.latch_unsignaled=1 \
@ -73,7 +76,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
    ro.opengles.version=196610 \
    ro.qualcomm.cabl=0 \
    ro.sf.lcd_density=440 \
-    sdm.debug.disable_skip_validate=1
+    vendor.display.disable_skip_validate=1 \
    vendor.gralloc.enable_fb_ubwc=1 \
    vendor.video.disable.ubwc=1
 # GPS
 PRODUCT_PROPERTY_OVERRIDES += \
@ -97,11 +102,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
    vidc.enc.dcvs.extra-buff-count=2 \
    vidc.enc.target_support_bframe=1
 # Netflix custom property
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.netflix.bsp_rev=Q660-13149-1
 # QCOM
 PRODUCT_PROPERTY_OVERRIDES += \
    persist.cne.feature=1 \
    persist.dpm.feature=1 \
    persist.timed.enable=true \
    persist.vendor.cne.feature=1 \
    persist.vendor.dpm.feature=1 \
    persist.vendor.qcomsysd.enabled=1 \
    ro.vendor.at_library=libqti-at.so \
    ro.vendor.extension_library=libqti-perfd-client.so
@ -116,23 +125,24 @@ PRODUCT_PROPERTY_OVERRIDES += \
    persist.data.df.iwlan_mux=9 \
    persist.data.df.mux_count=8 \
    persist.data.df.ul_mode=5 \
    persist.data.mode=concurrent \
    persist.data.netmgrd.qos.enable=true \
    persist.data.wda.enable=true \
    persist.radio.VT_CAM_INTERFACE=2 \
-    persist.radio.apm_sim_not_pwdn=1 \
+    persist.radio.data_con_rprt=1 \
    persist.radio.atfwd.start=true \
    persist.radio.multisim.config=dsds \
    persist.radio.schd.cache=3500 \
    persist.rmnet.data.enable=true \
    persist.vendor.data.mode=concurrent \
    persist.vendor.qti.telephony.vt_cam_interface=1 \
    persist.vendor.radio.apm_sim_not_pwdn=1 \
    persist.vendor.radio.atfwd.start=true \
    persist.vendor.radio.custom_ecc=1 \
    persist.vendor.radio.rat_on=combine \
    persist.vendor.radio.sib16_support=1 \
    ril.subscription.types=NV,RUIM \
    rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \
    ro.telephony.default_network=22,20 \
-    ro.use_data_netmgrd=true \
+    ro.vendor.use_data_netmgrd=true \
    telephony.lteOnCdmaDevice=1
 # Sensor
@ -144,7 +154,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
    ro.vendor.sensors.mot_detect=true \
    ro.vendor.sensors.pmd=true \
    ro.vendor.sensors.sta_detect=true
 # Subsystem Restart
 PRODUCT_PROPERTY_OVERRIDES += \
    persist.sys.ssr.restart_level=ALL_ENABLE
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@ -1,4 +1,4 @@
-# ADSP - from wayne
+# ADSP - from jasmine
 vendor/bin/adsprpcd
 vendor/lib/libadsp_default_listener.so
 vendor/lib/libadsp_hvx_callback_skel.so
@ -7,14 +7,16 @@ vendor/lib/libadsprpc.so
 vendor/lib/libfastcvadsp_stub.so
 vendor/lib/libfastcvopt.so
 vendor/lib/libmdsprpc.so
 vendor/lib/libsdsprpc.so
 vendor/lib64/libadsp_default_listener.so
 vendor/lib64/libadsprpc.so
 vendor/lib64/libfastcvadsp_stub.so
 vendor/lib64/libfastcvopt.so
 vendor/lib64/libmdsprpc.so
 vendor/lib64/libsdsprpc.so
-# ADSP modules - from wayne
+# ADSP modules - from jasmine
-vendor/lib/libsdsprpc.so
+vendor/etc/scve/facereco/gModel.dat
 vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so
 vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so
 vendor/lib/rfsa/adsp/dirac_resource.dar
@ -24,23 +26,18 @@ vendor/lib/rfsa/adsp/libadsp_hvx_skel.so
 vendor/lib/rfsa/adsp/libapps_mem_heap.so
 vendor/lib/rfsa/adsp/libdirac-capiv2.so
 vendor/lib/rfsa/adsp/libdspCV_skel.so
 vendor/lib/rfsa/adsp/libfastcvadsp_skel.so
 vendor/lib/rfsa/adsp/libfastcvadsp.so
-vendor/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so
+vendor/lib/rfsa/adsp/libfastcvadsp_skel.so
 vendor/lib/rfsa/adsp/libFastRPC_UTF_Forward_800h_skel.so
 vendor/lib/rfsa/adsp/libFastRPC_UTF_Forward_Qtc2_skel.so
 vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so
-vendor/lib/rfsa/adsp/libscveFaceLandmark_skel.so
+vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
 vendor/lib/rfsa/adsp/libscveT2T_skel.so
 vendor/lib/rfsa/adsp/libvpp_svc_skel.so
 vendor/lib64/libsdsprpc.so
-# Alarm - from wayne
+# Alarm - from jasmine
-etc/permissions/vendor-qti-hardware-alarm.xml:vendor/etc/permissions/vendor-qti-hardware-alarm.xml
+framework/vendor.qti.hardware.alarm-V1.0-java.jar
 -vendor/app/PowerOffAlarm/PowerOffAlarm.apk
 vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
 vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
 vendor/framework/vendor.qti.hardware.alarm-V1.0-java.jar
 vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.alarm@1.0.so
@ -49,18 +46,13 @@ lib/com.qualcomm.qti.ant@1.0.so
 -lib/libantradio.so
 lib64/com.qualcomm.qti.ant@1.0.so
 -lib64/libantradio.so
-vendor/lib/com.qualcomm.qti.ant@1.0_vendor.so
+vendor/lib/com.qualcomm.qti.ant@1.0.so
 vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so
-vendor/lib64/com.qualcomm.qti.ant@1.0_vendor.so
+vendor/lib64/com.qualcomm.qti.ant@1.0.so
 vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
 # Audio - from wayne
 vendor/etc/drc/drc_cfg_5.1.txt
 vendor/etc/drc/drc_cfg_AZ.txt
 vendor/etc/surround_sound_3mic/surround_sound_rec_5.1.cfg
 vendor/etc/surround_sound_3mic/surround_sound_rec_AZ.cfg
 vendor/lib/libacdb-fts.so
 vendor/lib/libacdbmapper.so
 vendor/lib/libacdbloader.so
 vendor/lib/libacdbrtac.so
 vendor/lib/libadiertac.so
@ -75,9 +67,7 @@ vendor/lib/soundfx/libasphere.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libqcvirt.so
 vendor/lib/soundfx/libshoebox.so
 vendor/lib64/libacdb-fts.so
 vendor/lib64/libacdbmapper.so
 vendor/lib64/libacdbloader.so
 vendor/lib64/libacdbrtac.so
 vendor/lib64/libadiertac.so
@ -87,11 +77,9 @@ vendor/lib64/libaudioparsers.so
 vendor/lib64/libqtigef.so
 vendor/lib64/soundfx/libasphere.so
 vendor/lib64/soundfx/libqcbassboost.so
 vendor/lib64/soundfx/libqcreverb.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libshoebox.so
-# Audio ACDB - from wayne
+# Audio ACDB - from jasmine
 vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_General_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_Global_cal.acdb
@ -102,13 +90,12 @@ vendor/etc/acdbdata/MTP/MTP_Speaker_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_workspaceFile.qwsp
 vendor/etc/acdbdata/adsp_avs_config.acdb
-# Audio Power Amplifier - from wayne
+# Audio Power Amplifier - from jasmine
 vendor/firmware/dbmd4_va_fw.bin
 vendor/firmware/tas2557_uCDSP.bin
 vendor/firmware/tfa98xx.cnt
-# Bluetooth - from wayne
+# Bluetooth - from jasmine
 vendor/bin/btnvtool
 vendor/bin/hci_qcomm_init
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
@ -839,20 +826,25 @@ vendor/lib/libmmcamera_isp_sce40.so
 vendor/lib/libmmcamera_isp_snr47.so
 vendor/lib/libmmcamera_isp_sub_module.so
-# Charger - from wayne
+# Charger - from jasmine
 vendor/bin/hvdcp_opti
-# CNE - from wayne
+# CNE - from jasmine
 etc/cne/andsfCne.xml
 etc/cne/SwimConfig.xml
 etc/permissions/cneapiclient.xml
 etc/permissions/com.quicinc.cne.xml
 framework/cneapiclient.jar
 framework/com.quicinc.cne.api-V1.0-java.jar
 framework/com.quicinc.cne.api-V1.1-java.jar
 framework/com.quicinc.cne.constants-V1.0-java.jar
 framework/com.quicinc.cne.constants-V2.0-java.jar
 framework/com.quicinc.cne.constants-V2.1-java.jar
 framework/com.quicinc.cne.jar
-lib64/libvendorconn.so
+framework/com.quicinc.cne.server-V1.0-java.jar
-lib64/vendor.qti.hardware.data.latency@1.0.so
+framework/com.quicinc.cne.server-V2.0-java.jar
-lib/libvendorconn.so
+framework/com.quicinc.cne.server-V2.1-java.jar
-lib/vendor.qti.hardware.data.latency@1.0.so
+framework/com.quicinc.cne.server-V2.2-java.jar
 framework/vendor.qti.data.factory-V1.0-java.jar
 framework/vendor.qti.hardware.data.qmi-V1.0-java.jar
 -priv-app/CNEService/CNEService.apk
 vendor/bin/cnd
 vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml
@ -868,76 +860,52 @@ vendor/etc/cne/wqeclient/ROW/ROW_profile4.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile5.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile6.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile7.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile15.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile16.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile17.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile18.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile19.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile20.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile21.xml
 vendor/etc/cne/wqeclient/ROW/ROW_profile32.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile1.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile2.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile3.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile4.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml
-vendor/lib64/com.quicinc.cne.api@1.0.so
+-vendor/lib64/com.quicinc.cne.api@1.0.so
-vendor/lib64/com.quicinc.cne.constants@1.0.so
+-vendor/lib64/com.quicinc.cne.api@1.1.so
-vendor/lib64/com.quicinc.cne.constants@2.0.so
+-vendor/lib64/com.quicinc.cne.constants@1.0.so
-vendor/lib64/com.quicinc.cne.server@1.0.so
+-vendor/lib64/com.quicinc.cne.constants@2.0.so
-vendor/lib64/com.quicinc.cne.server@2.0.so
+-vendor/lib64/com.quicinc.cne.constants@2.1.so
 -vendor/lib64/com.quicinc.cne.server@2.0.so
 -vendor/lib64/com.quicinc.cne.server@2.1.so
 -vendor/lib64/com.quicinc.cne.server@2.2.so
 vendor/lib64/libcne.so
 vendor/lib64/libcneapiclient.so
 vendor/lib64/libcneoplookup.so
 vendor/lib64/libcneqmiutils.so
 vendor/lib64/libcne.so
 vendor/lib64/libwms.so
 vendor/lib64/libwqe.so
 vendor/lib64/libxml.so
-vendor/lib64/vendor.qti.hardware.data.latency@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.data.latency@1.0.so
-vendor/lib/com.quicinc.cne.api@1.0.so
+vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so
-vendor/lib/com.quicinc.cne.constants@1.0.so
+vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
-vendor/lib/com.quicinc.cne.constants@2.0.so
+vendor/lib64/vendor.qti.data.factory@1.0.so
-vendor/lib/com.quicinc.cne.server@1.0.so
+vendor/lib64/vendor.qti.latency@2.0.so
 vendor/lib/com.quicinc.cne.server@2.0.so
 vendor/lib/libcneapiclient.so
 vendor/lib/libcneoplookup.so
 vendor/lib/libcneqmiutils.so
 vendor/lib/libcne.so
 vendor/lib/libwms.so
 vendor/lib/libwqe.so
 vendor/lib/libxml.so
 vendor/lib/vendor.qti.hardware.data.latency@1.0_vendor.so
-# Consumerir - from wayne
+# Consumerir - from jasmine
 vendor/lib/hw/consumerir.default.so
 vendor/lib64/hw/consumerir.default.so
-# Display - from wayne
+# Display Calibration - from jasmine
 etc/permissions/com.qti.snapdragon.sdk.display.xml
 -framework/com.qti.snapdragon.sdk.display.jar
 lib/libsd_sdk_display.so
 lib/libsdm-disp-apis.so
 lib/vendor.display.color@1.0.so
 lib/vendor.display.postproc@1.0.so
 lib/vendor.qti.hardware.qdutils_disp@1.0.so
 lib64/libsd_sdk_display.so
 lib64/libsdm-disp-apis.so
 lib64/vendor.display.color@1.0.so
 lib64/vendor.display.postproc@1.0.so
 lib64/vendor.qti.hardware.qdutils_disp@1.0.so
 -vendor/app/colorservice/colorservice.apk
 vendor/bin/hw/vendor.display.color@1.0-service
 vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti
 vendor/etc/init/vendor.display.color@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc
 vendor/lib/libsdm-color.so
 vendor/lib/libsdm-diag.so
 vendor/lib/libsdmextension.so
 vendor/lib64/libsdm-color.so
 vendor/lib64/libsdm-diag.so
 vendor/lib64/libsdmextension.so
 # Display Calibration - from wayne
 vendor/etc/qdcm_calib_data_tianma_nt36672_fhd_video_mode_dsi_panel.xml
 vendor/etc/qdcm_calib_data_jdi_nt36672_fhd_video_mode_dsi_panel.xml
-# DPM - from wayne
+# DPM - from jasmine
 bin/dpmd
 etc/dpm/dpm.conf
 etc/dpm/nsrm/NsrmConfiguration.xml
 etc/init/dpmd.rc
 etc/permissions/com.qti.dpmframework.xml
 etc/permissions/dpmapi.xml
@ -945,37 +913,25 @@ framework/com.qti.dpmframework.jar
 framework/dpmapi.jar
 framework/tcmclient.jar
 -priv-app/dpmserviceapp/dpmserviceapp.apk
 lib/com.qualcomm.qti.dpm.api@1.0.so
 lib/libdiag_system.so
 lib/libdpmctmgr.so
 lib/libdpmfdmgr.so
 lib/libdpmframework.so
 lib/libdpmnsrm.so
 lib/libdpmtcm.so
 lib64/com.qualcomm.qti.dpm.api@1.0.so
 lib64/libdiag_system.so
 lib64/libdpmctmgr.so
 lib64/libdpmfdmgr.so
 lib64/libdpmframework.so
 lib64/libdpmnsrm.so
 lib64/libdpmtcm.so
 vendor/bin/dpmQmiMgr
 vendor/lib/com.qualcomm.qti.dpm.api@1.0_vendor.so
 vendor/lib/libdpmqmihal.so
 vendor/lib64/com.qualcomm.qti.dpm.api@1.0_vendor.so
 vendor/lib64/libdpmqmihal.so
 vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
-# DRM - from wayne
+# DRM - from jasmine
 lib/libGPTEE_system.so
 lib/libQTEEConnector_system.so
 lib/vendor.qti.hardware.qteeconnector@1.0.so
 lib64/libGPTEE_system.so
 lib64/libQTEEConnector_system.so
 lib64/vendor.qti.hardware.qteeconnector@1.0.so
 vendor/bin/hw/android.hardware.drm@1.0-service.widevine
 vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service
 vendor/bin/qseecomd
 vendor/etc/init/android.hardware.drm@1.0-service.widevine.rc
 vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc
 vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
 vendor/lib/libbase64.so
@ -999,12 +955,6 @@ vendor/lib/libsi.so
 vendor/lib/libssd.so
 vendor/lib/libStDrvInt.so
 vendor/lib/libtzdrmgenprov.so
 vendor/lib/qcdrm/playready/lib/drm/libdrmprplugin_customer.so
 vendor/lib/qcdrm/playready/lib/libprdrmdecrypt_customer.so
 vendor/lib/qcdrm/playready/lib/libtzplayready_customer.so
 vendor/lib/qcdrm/playready/lib/mediadrm/libprmediadrmdecrypt_customer.so
 vendor/lib/qcdrm/playready/lib/mediadrm/libprmediadrmplugin_customer.so
 vendor/lib/vendor.qti.hardware.qteeconnector@1.0_vendor.so
 vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
 vendor/lib64/libbase64.so
 vendor/lib64/libdrmfs.so
@ -1026,29 +976,18 @@ vendor/lib64/libsi.so
 vendor/lib64/libssd.so
 vendor/lib64/libStDrvInt.so
 vendor/lib64/libtzdrmgenprov.so
-vendor/lib64/vendor.qti.hardware.qteeconnector@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so
-# ESE-Powermanager - from wayne
+# Fingerprint - from jasmine
 lib/vendor.qti.esepowermanager@1.0.so
 lib64/vendor.qti.esepowermanager@1.0.so
 vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
 vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
 vendor/lib/vendor.qti.esepowermanager@1.0_vendor.so
 vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so
 vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so
 vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so
 # Fingerprint - from wayne
 vendor/lib64/hw/fingerprint.default.so:vendor/lib64/hw/fingerprint.goodix.so
 vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.fpc.so
 vendor/lib64/com.fingerprints.extension@1.0.so
 vendor/lib64/libgoodixfingerprintd_binder.so
 vendor/lib64/libgf_ca.so
 vendor/lib64/libgf_hal.so
 vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so
 vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so
-# Fingerprint firmware - from wayne
+# Fingerprint firmware - from jasmine
 etc/firmware/goodixfp.b00
 etc/firmware/goodixfp.b01
 etc/firmware/goodixfp.b02
@ -1068,71 +1007,56 @@ vendor/firmware/fpctzappfingerprint.b06
 vendor/firmware/fpctzappfingerprint.b07
 vendor/firmware/fpctzappfingerprint.mdt
-# FM - from wayne
+# FM - from jasmine
 lib/libfm-hci.so
 lib/fm_helium.so
 lib64/libfm-hci.so
 lib64/fm_helium.so
 vendor/bin/fm_qsoc_patches
 -lib/vendor.qti.hardware.fm@1.0.so
 -lib64/vendor.qti.hardware.fm@1.0.so
 vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
-vendor/lib/vendor.qti.hardware.fm@1.0_vendor.so
+vendor/lib/vendor.qti.hardware.fm@1.0.so
 vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.fm@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.fm@1.0.so
-# Gatekeeper - from wayne
+# Gatekeeper - from jasmine
 vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
 vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
-# GPS - from wayne
+# GPS - from jasmine
 etc/permissions/com.qti.location.sdk.xml
 etc/permissions/izat.xt.srv.xml
 framework/com.qti.location.sdk.jar
 framework/izat.xt.srv.jar
 lib/vendor.qti.gnss@1.0.so
 lib/vendor.qti.gnss@1.1.so
 lib/vendor.qti.gnss@1.2.so
 lib/vendor.qti.gnss@2.0.so
 lib/libxt_native.so
 lib64/vendor.qti.gnss@1.0.so
 lib64/vendor.qti.gnss@1.1.so
 lib64/vendor.qti.gnss@1.2.so
 lib64/vendor.qti.gnss@2.0.so
 lib64/libxt_native.so
-vendor/bin/hw/vendor.qti.gnss@1.0-service
+vendor/bin/hw/vendor.qti.gnss@2.0-service
 vendor/bin/DR_AP_Service
 vendor/bin/garden_app
 vendor/bin/loc_launcher
 vendor/bin/lowi-server
 vendor/bin/xtra-daemon
 vendor/bin/xtwifi-client
 vendor/bin/xtwifi-inet-agent
 vendor/etc/cacert_location.pem
 vendor/etc/init/vendor.qti.gnss@1.0-service.rc
 vendor/etc/xtra_root_cert.pem
 -vendor/lib64/libloc_api_v02.so
 vendor/lib64/libloc_ds_api.so
 vendor/bin/slim_daemon
-vendor/lib/hw/vendor.qti.gnss@1.0-impl.so
+vendor/bin/xtra-daemon
-vendor/lib/libalarmservice_jni.so
+vendor/etc/init/vendor.qti.gnss@2.0-service.rc
-vendor/lib/lib_drplugin_server.so
+vendor/etc/cacert_location.pem
-vendor/lib/libdataitems.so
+vendor/etc/xtra_root_cert.pem
-vendor/lib/libDRPlugin.so
+vendor/lib/hw/vendor.qti.gnss@2.0-impl.so
-vendor/lib/libdrplugin_client.so
+vendor/lib/vendor.qti.gnss@1.0.so
-vendor/lib/libevent_observer.so
+vendor/lib/vendor.qti.gnss@1.1.so
-vendor/lib/libflp.so
+vendor/lib/vendor.qti.gnss@1.2.so
-vendor/lib/libgdtap.so
+vendor/lib/vendor.qti.gnss@2.0.so
-vendor/lib/libgeofence.so
+vendor/lib64/hw/vendor.qti.gnss@2.0-impl.so
 -vendor/lib/libgnsspps.so
 vendor/lib/libizat_client_api.so
 vendor/lib/libizat_core.so
 vendor/lib/liblbs_core.so
 vendor/lib/libloc_api_v02.so
 vendor/lib/libloc_ds_api.so
 vendor/lib/libloc_externalDr.so
 vendor/lib/liblocationservice.so
 vendor/lib/liblocationservice_glue.so
 vendor/lib/liblowi_client.so
 vendor/lib/liblowi_wifihal.so
 vendor/lib/libquipc_os_api.so
 vendor/lib/libslimclient.so
 vendor/lib/libulp2.so
 vendor/lib/libxtadapter.so
 vendor/lib/libxtwifi_ulp_adaptor.so
 vendor/lib/vendor.qti.gnss@1.0_vendor.so
 vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so
 vendor/lib64/lib_drplugin_server.so
 vendor/lib64/libalarmservice_jni.so
 vendor/lib64/libdataitems.so
@ -1142,10 +1066,11 @@ vendor/lib64/libevent_observer.so
 vendor/lib64/libflp.so
 vendor/lib64/libgdtap.so
 vendor/lib64/libgeofence.so
 -vendor/lib64/libgnsspps.so
 vendor/lib64/libizat_client_api.so
 vendor/lib64/libizat_core.so
 vendor/lib64/liblbs_core.so
 vendor/lib64/libloc_api_v02.so
 vendor/lib64/libloc_ds_api.so
 vendor/lib64/libloc_externalDr.so
 vendor/lib64/liblocationservice_glue.so
 vendor/lib64/liblocationservice.so
@ -1156,9 +1081,12 @@ vendor/lib64/libslimclient.so
 vendor/lib64/libulp2.so
 vendor/lib64/libxtadapter.so
 vendor/lib64/libxtwifi_ulp_adaptor.so
-vendor/lib64/vendor.qti.gnss@1.0_vendor.so
+vendor/lib64/vendor.qti.gnss@1.0.so
 vendor/lib64/vendor.qti.gnss@1.1.so
 vendor/lib64/vendor.qti.gnss@1.2.so
 vendor/lib64/vendor.qti.gnss@2.0.so
-# Graphics firmware - from wayne
+# Graphics firmware - from jasmine
 vendor/firmware/a512_zap.b00
 vendor/firmware/a512_zap.b01
 vendor/firmware/a512_zap.b02
@ -1168,38 +1096,7 @@ vendor/firmware/a530_pfp.fw
 vendor/firmware/a530_pm4.fw
 vendor/firmware/a540_gpmu.fw2
-# Graphics - from wayne
+# Graphics - from jasmine
 vendor/lib/egl/eglSubDriverAndroid.so
 vendor/lib/egl/libEGL_adreno.so
 vendor/lib/egl/libGLESv1_CM_adreno.so
 vendor/lib/egl/libGLESv2_adreno.so
 vendor/lib/egl/libq3dtools_adreno.so
 vendor/lib/egl/libq3dtools_esx.so
 vendor/lib/egl/libQTapGLES.so
 vendor/lib/hw/vulkan.sdm660.so
 vendor/lib/libadreno_utils.so
 vendor/lib/libbccQTI.so
 vendor/lib/libC2D2.so
 vendor/lib/libc2d30_bltlib.so
 vendor/lib/libc2d30-a3xx.so
 vendor/lib/libc2d30-a4xx.so
 vendor/lib/libc2d30-a5xx.so
 vendor/lib/libCB.so
 vendor/lib/libgsl.so
 vendor/lib/libllvm-glnext.so
 vendor/lib/libllvm-qcom.so
 vendor/lib/libllvm-qgl.so
 vendor/lib/libmm-disp-apis.so
 vendor/lib/libmm-qdcm.so
 vendor/lib/libOpenCL.so
 vendor/lib/libpvr.so
 vendor/lib/libqseed3.so
 vendor/lib/librs_adreno_sha1.so
 vendor/lib/librs_adreno.so
 vendor/lib/libRSDriver_adreno.so
 -vendor/lib/libsdm-disp-vndapis.so
 vendor/lib/libtinyxml2_1.so
 -vendor/lib64/libsdm-disp-vndapis.so
 vendor/lib64/egl/eglSubDriverAndroid.so
 vendor/lib64/egl/libEGL_adreno.so
 vendor/lib64/egl/libGLESv1_CM_adreno.so
@ -1207,36 +1104,66 @@ vendor/lib64/egl/libGLESv2_adreno.so
 vendor/lib64/egl/libq3dtools_adreno.so
 vendor/lib64/egl/libq3dtools_esx.so
 vendor/lib64/egl/libQTapGLES.so
 vendor/lib64/hw/vulkan.sdm660.so
 vendor/lib64/libadreno_utils.so
 vendor/lib64/libbccQTI.so
 vendor/lib64/libC2D2.so
 vendor/lib64/libc2d30_bltlib.so
 vendor/lib64/libc2d30-a3xx.so
 vendor/lib64/libc2d30-a4xx.so
 vendor/lib64/libc2d30-a5xx.so
 vendor/lib64/libCB.so
 vendor/lib64/libgsl.so
 vendor/lib64/libllvm-glnext.so
 vendor/lib64/libllvm-qcom.so
 vendor/lib64/libllvm-qgl.so
 vendor/lib64/libmm-disp-apis.so
 vendor/lib64/libmm-qdcm.so
 vendor/lib64/libOpenCL.so
 vendor/lib64/libpvr.so
 vendor/lib64/libqseed3.so
 vendor/lib64/librs_adreno_sha1.so
 vendor/lib64/librs_adreno.so
 vendor/lib64/libRSDriver_adreno.so
-vendor/lib64/libtinyxml2_1.so
+vendor/lib/egl/eglSubDriverAndroid.so
 vendor/lib/egl/libEGL_adreno.so
 vendor/lib/egl/libGLESv1_CM_adreno.so
 vendor/lib/egl/libGLESv2_adreno.so
 vendor/lib/egl/libq3dtools_adreno.so
 vendor/lib/egl/libq3dtools_esx.so
 vendor/lib/egl/libQTapGLES.so
 vendor/lib/libadreno_utils.so
 vendor/lib/libbccQTI.so
 vendor/lib/libC2D2.so
 vendor/lib/libc2d30_bltlib.so
 vendor/lib/libCB.so
 vendor/lib/libgsl.so
 vendor/lib/libllvm-glnext.so
 vendor/lib/libllvm-qcom.so
 vendor/lib/libOpenCL.so
 vendor/lib/librs_adreno_sha1.so
 vendor/lib/librs_adreno.so
 vendor/lib/libRSDriver_adreno.so
-# Keymaster QTI - from wayne
+# Graphics (HDR) - from jasmine
 vendor/lib/libhdr_tm.so
 vendor/lib64/libhdr_tm.so
 # Graphics (SDM) - from LA.UM.7.4.r1-04100-8x98.0
 vendor/lib/libqseed3.so|c60e08f5efa1e9aea339a7a5a6dccdc2d107f530
 vendor/lib/libsdm-color.so|8e083bb2a20ecf76bf96e303134cbaa9ce46be81
 vendor/lib/libsdm-diag.so|e0455e9dd0e2378a3f770eb914aa11e612d594eb
 vendor/lib/libsdmextension.so|3104df6a013e53b972227ed132aa683ec7303746
 vendor/lib/libtinyxml2_1.so|20fea724b7a9f94530833cfdc841049104a0ffa3
 vendor/lib64/libqseed3.so|f95dd7b55de9401ce2f568e3ec18493daa5a6bfe
 vendor/lib64/libsdm-color.so|1a9b68e5f2f09d37c2fa83907a6a70c7adb081f5
 vendor/lib64/libsdm-diag.so|25bab19a8c4453b3d20e3e1a71a0e8d3675b17b4
 vendor/lib64/libsdm-disp-vndapis.so|8ac59a32a2601a8a4b0d3b097ed02f1279f3c6b7
 vendor/lib64/libsdmextension.so|c4a416cb8c0f5dc87bee8494d70247cf049224b9
 vendor/lib64/libtinyxml2_1.so|9d5179eda8ce70b9a4014b144f9d23d33509fddc
 # Graphics (Vulkan)
 vendor/lib/hw/vulkan.sdm660.so
 vendor/lib64/hw/vulkan.sdm660.so
 # Keymaster QTI - from jasmine
 vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
 vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so
 vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc
 vendor/bin/hw/android.hardware.keymaster@3.0-service-qti
-# Keymaster - from wayne
+# Keymaster - from jasmine
 vendor/lib/libkeymasterutils.so
 vendor/lib/libkeymasterprovision.so
 vendor/lib/libkeymasterdeviceutils.so
@ -1244,11 +1171,11 @@ vendor/lib64/libkeymasterutils.so
 vendor/lib64/libkeymasterprovision.so
 vendor/lib64/libkeymasterdeviceutils.so
-# Keystore - from wayne
+# Keystore - from jasmine
 vendor/lib/hw/keystore.sdm660.so
 vendor/lib64/hw/keystore.sdm660.so
-# Listen - from wayne
+# Listen - from jasmine
 vendor/lib/hw/sound_trigger.primary.sdm660.so
 vendor/lib/libadpcmdec.so
 vendor/lib/libsmwrapper.so
@ -1264,7 +1191,7 @@ vendor/lib64/libgcs-osal.so
 vendor/lib64/libgcs.so
 vendor/lib64/vendor.qti.voiceprint@1.0.so
-# Media - from wayne
+# Media - from jasmine
 lib/libmmosal.so
 lib/vendor.qti.hardware.vpp@1.1.so
 lib64/libmmosal.so
@ -1298,7 +1225,7 @@ vendor/lib/libOmxWmaDec.so
 vendor/lib/libvpphvx.so
 vendor/lib/libvqzip.so
 vendor/lib/libvpptestutils.so
-vendor/lib/vendor.qti.hardware.vpp@1.1_vendor.so
+vendor/lib/vendor.qti.hardware.vpp@1.1.so
 vendor/lib64/libAlacSwDec.so
 vendor/lib64/libApeSwDec.so
 vendor/lib64/libFlacSwDec.so
@ -1324,9 +1251,9 @@ vendor/lib64/libOmxWmaDec.so
 vendor/lib64/libvpplibrary.so
 vendor/lib64/libvpphvx.so
 vendor/lib64/libvpptestutils.so
-vendor/lib64/vendor.qti.hardware.vpp@1.1_vendor.so
+vendor/lib64/vendor.qti.hardware.vpp@1.1.so
-# Perf - from wayne
+# Perf - from jasmine
 lib/libqti_performance.so
 lib/vendor.qti.hardware.perf@1.0.so
 lib/libqti-perfd-client_system.so
@ -1342,34 +1269,26 @@ vendor/bin/msm_irqbalance
 vendor/bin/hw/vendor.qti.hardware.perf@1.0-service
 vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc
 vendor/etc/perf/perfboostsconfig.xml
 vendor/lib/libfeedbackhandler.so
 vendor/lib/libperfgluelayer.so
 vendor/lib/libqti-perfd-client.so
 vendor/lib/libqti-perfd.so
 vendor/lib/libqti-util.so
 vendor/lib/libqti-utils.so
 vendor/lib/libqti-gt-prop.so
 vendor/lib/libqti-iopd-client.so
-vendor/lib/libqti-iopd.so
+vendor/lib/hw/vendor.qti.hardware.iop@2.0-impl.so
-vendor/lib/hw/vendor.qti.hardware.iop@1.0-impl.so
+vendor/lib/vendor.qti.hardware.perf@1.0.so
-vendor/lib/vendor.qti.hardware.perf@1.0_vendor.so
+vendor/lib/vendor.qti.hardware.iop@1.0.so
-vendor/lib/vendor.qti.hardware.iop@1.0_vendor.so
+vendor/lib/vendor.qti.hardware.iop@2.0.so
 vendor/lib/vendor.qti.hardware.iop@2.0_vendor.so
 vendor/lib/vendor.qti.hardware.limits@1.0_vendor.so
 vendor/lib64/libfeedbackhandler.so
 vendor/lib64/libperfgluelayer.so
 vendor/lib64/libqti-perfd-client.so
 vendor/lib64/libqti-perfd.so
 vendor/lib64/libqti-util.so
 vendor/lib64/libqti-utils.so
 vendor/lib64/libqti-gt-prop.so
 vendor/lib64/libqti-iopd-client.so
-vendor/lib64/libqti-iopd.so
+vendor/lib64/hw/vendor.qti.hardware.iop@2.0-impl.so
-vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.perf@1.0.so
-vendor/lib64/vendor.qti.hardware.perf@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.iop@1.0.so
-vendor/lib64/vendor.qti.hardware.iop@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.iop@2.0.so
 vendor/lib64/vendor.qti.hardware.iop@2.0_vendor.so
 vendor/lib64/vendor.qti.hardware.limits@1.0_vendor.so
 # Peripheral manager - from wayne
 vendor/bin/pm-proxy
@ -1377,25 +1296,21 @@ vendor/bin/pm-service
 vendor/lib/libperipheral_client.so
 vendor/lib64/libperipheral_client.so
-# Postprocessing - from wayne
+# Postprocessing - from jasmine
-etc/calib.cfg
+vendor/bin/hw/vendor.display.color@1.0-service
 vendor/bin/mm-pp-dpps
-vendor/lib/libdisp-aba.so
+vendor/etc/init/vendor.display.color@1.0-service.rc
 vendor/lib64/libdisp-aba.so
-vendor/lib/vendor.display.color@1.0_vendor.so
+vendor/lib64/vendor.display.color@1.0.so
-vendor/lib/vendor.display.postproc@1.0_vendor.so
+vendor/lib64/vendor.display.color@1.1.so
-vendor/lib/vendor.qti.hardware.qdutils_disp@1.0_vendor.so
+vendor/lib64/vendor.display.postproc@1.0.so
 vendor/lib64/vendor.display.color@1.0_vendor.so
 vendor/lib64/vendor.display.postproc@1.0_vendor.so
 vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0_vendor.so
-# QMI - from wayne
+# QMI - from jasmine
 vendor/bin/irsc_util
 etc/permissions/qti_libpermissions.xml|ef3c88495f2f61a2d16e1445113a9d80f8db0e0a
 etc/permissions/qti_permissions.xml
 etc/permissions/qti_libpermissions.xml|ef3c88495f2f61a2d16e1445113a9d80f8db0e0a
 vendor/bin/irsc_util
 vendor/bin/pd-mapper
 vendor/lib/libdiag.so
 vendor/lib/libdsi_netctrl.so
 vendor/lib/libdsutils.so
 vendor/lib/libidl.so
 vendor/lib/libqcci_legacy.so
@ -1409,10 +1324,7 @@ vendor/lib/libqmi_csi.so
 vendor/lib/libqmi_encdec.so
 vendor/lib/libqmi.so
 vendor/lib/libqmiservices.so
 vendor/lib/libsmemlog.so
 vendor/lib/libUserAgent.so
 vendor/lib64/libdiag.so
 vendor/lib64/libdsi_netctrl.so
 vendor/lib64/libdsutils.so
 vendor/lib64/libidl.so
 vendor/lib64/libqcci_legacy.so
@ -1426,68 +1338,47 @@ vendor/lib64/libqmi_csi.so
 vendor/lib64/libqmi_encdec.so
 vendor/lib64/libqmi.so
 vendor/lib64/libqmiservices.so
 vendor/lib64/libsmemlog.so
 vendor/lib64/libUserAgent.so
-# Radio - from wayne
+
 # Radio - from jasmine
 -app/datastatusnotification/datastatusnotification.apk
 -app/embms/embms.apk
 -app/QtiSystemService/QtiSystemService.apk
 -app/QtiTelephonyService/QtiTelephonyService.apk
 vendor/bin/ATFWD-daemon
 vendor/bin/ipacm-diag
 vendor/bin/netmgrd
 vendor/bin/port-bridge
 vendor/bin/rmt_storage
 vendor/bin/tftp_server
 vendor/bin/hw/qcrild
 vendor/etc/data/dsi_config.xml
 vendor/etc/data/netmgr_config.xml
-vendor/Diag.cfg
+vendor/etc/init/qcrild.rc
 etc/permissions/embms.xml
 etc/permissions/qcrilhook.xml
 etc/permissions/telephonyservice.xml
 framework/embmslibrary.jar
 -framework/qcrilhook.jar
-framework/qti-telephony-common.jar|4ebf6571b783b3e2fa9a0ca5457fd2f3b5c01162
+framework/qti-telephony-common.jar|e529711775c31da38c9ecd1ab94b27ee15570dc4
 framework/QtiTelephonyServicelibrary.jar
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 -vendor/app/SVIService/SVIService.apk
 vendor/bin/qti
 vendor/lib/lib_remote_simlock.so
 vendor/lib/libconfigdb.so
 vendor/lib/liblqe.so
 vendor/lib/libmdmdetect.so
 vendor/lib/libnetmgr.so
 vendor/lib/libpdmapper.so
 vendor/lib/libpdnotifier.so
 vendor/lib/libqcmaputils.so
 vendor/lib/libqcrilFramework.so
 vendor/lib/libril-qc-hal-qmi.so
 vendor/lib/librilqmiservices.so
 vendor/lib/libril-qc-ltedirectdisc.so
 vendor/lib/libril-qc-qmi-1.so
 vendor/lib/libril-qc-radioconfig.so
 vendor/lib/libril-qcril-hook-oem.so
 vendor/lib/libsettings.so
 vendor/lib/libsubsystem_control.so
 vendor/lib/libSubSystemShutdown.so
 vendor/lib/libsystem_health_mon.so
 vendor/lib/vendor.qti.hardware.radio.am@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.lpa@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.uim@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0_vendor.so
 vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0_vendor.so
 vendor/lib64/lib_remote_simlock.so
 vendor/lib64/libconfigdb.so
 vendor/lib64/libdsi_netctrl.so
 vendor/lib64/liblqe.so
 vendor/lib64/libmdmdetect.so
 vendor/lib64/libnetmgr.so
 vendor/lib64/libpdmapper.so
 vendor/lib64/libpdnotifier.so
 vendor/lib64/libnetmgr_common.so
 vendor/lib64/libnetmgr_nr_fusion.so
 vendor/lib64/libnetmgr_rmnet_ext.so
 vendor/lib64/libnlnetmgr.so
 vendor/lib64/libpdmapper.so
 vendor/lib64/libpdnotifier.so
 vendor/lib64/libqcmaputils.so
 vendor/lib64/libqrtr.so
 vendor/lib64/libqsocket.so
 vendor/lib64/libqcrilFramework.so
 vendor/lib64/libril-qc-hal-qmi.so
 vendor/lib64/libril-qc-ltedirectdisc.so
@ -1496,129 +1387,110 @@ vendor/lib64/libril-qc-radioconfig.so
 vendor/lib64/libril-qcril-hook-oem.so
 vendor/lib64/librilqmiservices.so
 vendor/lib64/libsettings.so
 vendor/lib64/libsubsystem_control.so
 vendor/lib64/libSubSystemShutdown.so
 vendor/lib64/libsystem_health_mon.so
-vendor/lib64/vendor.qti.hardware.radio.am@1.0_vendor.so
+vendor/lib64/qcrild_librilutils.so
-vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
-vendor/lib64/vendor.qti.hardware.radio.lpa@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
-vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
-vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
-vendor/lib64/vendor.qti.hardware.radio.uim@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
-vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so
-vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
 vendor/radio/qcril_database/qcril.db
-# Radio IMS - from wayne
+# Radio - IMS - from jasmine
 -app/ims/ims.apk
 -app/imssettings/imssettings.apk
-app/uceShimService/uceShimService.apk
+-priv-app/ims/ims.apk
-etc/permissions/qti-vzw-ims-internal.xml
+etc/permissions/com.qualcomm.qti.imscmservice.xml
-lib/com.qualcomm.qti.imscmservice@1.0.so
+etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
-lib/libimscamera_jni.so
+etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
-lib/lib-imscamera.so
+framework/com.qualcomm.qti.imscmservice-V2.0-java.jar
-lib/libimsmedia_jni.so
+framework/com.qualcomm.qti.imscmservice-V2.1-java.jar
-lib/lib-imsvideocodec.so
+framework/com.qualcomm.qti.uceservice-V2.0-java.jar
-lib/lib-imsvideocodec.so
+framework/vendor.qti.ims.callinfo-V1.0-java.jar
-lib/lib-imsvtextutils.so
+framework/vendor.qti.ims.rcsconfig-V1.0-java.jar
 lib/lib-imsvtutils.so
 lib/lib-imsvtutils.so
 lib/libmmrtpdecoder.so
 lib/libmmrtpencoder.so
 lib/librcc.so
 lib/vendor.qti.imsrtpservice@1.0.so
 lib64/com.qualcomm.qti.imscmservice@1.0.so
 lib64/libimscamera_jni.so
 lib64/lib-imscamera.so
 lib64/libimsmedia_jni.so
 lib64/lib-imsvideocodec.so
 lib64/lib-imsvtextutils.so
 lib64/lib-imsvt.so
 lib64/lib-imsvtextutils.so
 lib64/lib-imsvtutils.so
-lib64/libmmrtpdecoder.so
+lib64/libimscamera_jni.so
-lib64/libmmrtpencoder.so
+lib64/libimsmedia_jni.so
 lib64/librcc.so
-lib64/vendor.qti.imsrtpservice@1.0.so
+vendor/bin/ims_rtp_daemon
 vendor/bin/imsdatadaemon
 vendor/bin/imsqmidaemon
 vendor/bin/imsrcsd
-vendor/bin/ims_rtp_daemon
+vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so
-vendor/framework/qti-vzw-ims-internal.jar
+vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so
-vendor/lib/com.qualcomm.qti.imscmservice@1.0_vendor.so
+vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so
-vendor/lib/com.qualcomm.qti.imscmservice@1.1_vendor.so
+vendor/lib64/com.qualcomm.qti.uceservice@2.0.so
 vendor/lib/lib-dplmedia.so
 vendor/lib/lib-imscmservice.so
 vendor/lib/lib-imsdpl.so
 vendor/lib/lib-imsqimf.so
 vendor/lib/lib-imsrcs-v2.so
 vendor/lib/lib-imsxml.so
 vendor/lib/lib-rtpcommon.so
 vendor/lib/lib-rtpcore.so
 vendor/lib/lib-rtpdaemoninterface.so
 vendor/lib/lib-rtpsl.so
 vendor/lib/lib-uceservice.so
 vendor/lib/vendor.qti.hardware.radio.ims@1.0_vendor.so
 vendor/lib/vendor.qti.imsrtpservice@1.0-service-Impl.so
 vendor/lib/vendor.qti.imsrtpservice@1.0_vendor.so
 vendor/lib64/com.qualcomm.qti.imscmservice@1.0_vendor.so
 vendor/lib64/com.qualcomm.qti.imscmservice@1.1_vendor.so
 vendor/lib64/lib-dplmedia.so
 vendor/lib64/lib-imscmservice.so
 vendor/lib64/lib-imsdpl.so
 vendor/lib64/lib-imsqimf.so
 vendor/lib64/lib-imsrcs-v2.so
 vendor/lib64/lib-imsrcsbaseimpl.so
 vendor/lib64/lib-imsxml.so
 vendor/lib64/lib-rtpcommon.so
 vendor/lib64/lib-rtpcommon.so
 vendor/lib64/lib-rtpcore.so
 vendor/lib64/lib-rtpdaemoninterface.so
 vendor/lib64/lib-rtpsl.so
 vendor/lib64/lib-uceservice.so
-vendor/lib64/vendor.qti.hardware.radio.ims@1.0_vendor.so
+vendor/lib64/lib-siputility.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so
 vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so
-vendor/lib64/vendor.qti.imsrtpservice@1.0_vendor.so
+vendor/lib64/vendor.qti.imsrtpservice@1.0.so
 vendor/lib64/vendor.qti.ims.callinfo@1.0.so
 vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
-# Sensors - from wayne
+# Sensors - from jasmine
-vendor/bin/sensors.qcom
+vendor/bin/sensors.qti
 vendor/lib/hw/activity_recognition.sdm660.so
 vendor/lib/libsensor_reg.so
 vendor/lib/libsensor1.so
 vendor/lib/sensor_calibrate.so
 vendor/lib/sensors.ssc.so
 vendor/lib/vendor.qti.hardware.sensorscalibrate@1.0.so
 vendor/lib64/hw/activity_recognition.sdm660.so
 vendor/lib64/libsensor_reg.so
 vendor/lib64/libsensor1.so
 vendor/lib64/sensor_calibrate.so
 vendor/lib64/sensors.ssc.so
 vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so
-# Thermal - from wayne
+# Thermal - from jasmine
 vendor/etc/thermal-engine.conf
 vendor/etc/thermal-engine-map.conf
 vendor/etc/thermal-engine-normal.conf
 vendor/etc/thermal-engine-video.conf
 vendor/bin/thermal-engine
 -vendor/lib/libthermalclient.so
 -vendor/lib64/libthermalclient.so
 vendor/lib64/libthermalioctl.so
 vendor/lib64/libthermalfeature.so
-# Time services - from wayne
+# Time services - from jasmine
 -vendor/app/TimeService/TimeService.apk
 vendor/bin/time_daemon
 -vendor/lib/libtime_genoff.so
 -vendor/lib64/libtime_genoff.so
-# TUI - from wayne
+# TUI - from jasmine
 lib/vendor.qti.hardware.tui_comm@1.0.so
 lib64/vendor.qti.hardware.tui_comm@1.0.so
 vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
 vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc
-vendor/lib/vendor.qti.hardware.tui_comm@1.0_vendor.so
+vendor/lib/vendor.qti.hardware.tui_comm@1.0.so
-vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so
+vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
 # Widevine - from wayne
-vendor/bin/hw/android.hardware.drm@1.0-service.widevine
+vendor/bin/hw/android.hardware.drm@1.1-service.widevine
-vendor/etc/init/android.hardware.drm@1.0-service.widevine.rc
+vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc
-vendor/lib/libwvhidl.so
+vendor/lib64/libwvhidl.so
-# Wifi
+# Wifi - from jasmine
 vendor/bin/cnss-daemon
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@ -19,6 +19,14 @@ LOCAL_SRC_FILES    := bin/init.qcom.post_boot.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.sensors.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := bin/init.qcom.sensors.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.rc
 LOCAL_MODULE_TAGS  := optional eng
--- a/rootdir/bin/init.class_main.sh
+++ b/rootdir/bin/init.class_main.sh
@ -32,21 +32,84 @@
 #
 baseband=`getprop ro.baseband`
 sgltecsfb=`getprop persist.vendor.radio.sglte_csfb`
-datamode=`getprop persist.data.mode`
+datamode=`getprop persist.vendor.data.mode`
 rild_status=`getprop init.svc.ril-daemon`
 vendor_rild_status=`getprop init.svc.vendor.ril-daemon`
 case "$baseband" in
-    "apq" | "sda" )
+    "apq" | "sda" | "qcs" )
-    setprop ro.radio.noril yes
+    setprop ro.vendor.radio.noril yes
    if [ -n "$rild_status" ] || [ -n "$vendor_rild_status" ]; then
      stop ril-daemon
      stop vendor.ril-daemon
      start vendor.ipacm
    fi
 esac
 case "$baseband" in
    "msm" | "csfb" | "svlte2a" | "mdm" | "mdm2" | "sglte" | "sglte2" | "dsda2" | "unknown" | "dsda3")
-    start qmuxd
+    start vendor.qmuxd
 esac
 case "$baseband" in
-    "msm" | "csfb" | "svlte2a" | "mdm" | "mdm2" | "sglte" | "sglte2" | "dsda2" | "unknown" | "dsda3" | "sdm" | "sdx")
+    "msm" | "csfb" | "svlte2a" | "mdm" | "mdm2" | "sglte" | "sglte2" | "dsda2" | "unknown" | "dsda3" | "sdm" | "sdx" | "sm6")
    if [ -f /vendor/firmware_mnt/verinfo/ver_info.txt ]; then
        modem=`cat /vendor/firmware_mnt/verinfo/ver_info.txt |
                sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                sed 's/.*MPSS.\(.*\)/\1/g' | cut -d \. -f 1`
        # Check if this is AT 3.0 or below. If so, start ril-daemon 
        if [ "$modem" = "AT" ]; then
            version=`cat /vendor/firmware_mnt/verinfo/ver_info.txt |
                    sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                    sed 's/.*AT.\(.*\)/\1/g' | cut -d \- -f 1`
            if [ ! -z $version ]; then
                if [ "$version" \< "3.1" ]; then
                    # For OTA targets, ril-daemon will be defined and for new vendor.ril-daemon
                    # To keep this script agnostic,start both of them as only valid one will start.
                    start ril-daemon
                    start vendor.ril-daemon
                fi
            fi
        # For older than TA 3.0 start ril-daemon
        elif [ "$modem" = "TA" ]; then
            version=`cat /vendor/firmware_mnt/verinfo/ver_info.txt |
                    sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                    sed 's/.*TA.\(.*\)/\1/g' | cut -d \- -f 1`
            if [ ! -z $version ]; then
                if [ "$version" \< "3.0" ]; then
                    # For OTA targets, ril-daemon will be defined and for new vendor.ril-daemon
                    # To keep this script agnostic,start both of them as only valid one will start.
                    start ril-daemon
                    start vendor.ril-daemon
                fi
            fi
        # For older than JO 3.2 start ril-daemon
        elif [ "$modem" = "JO" ]; then
            version=`cat /vendor/firmware_mnt/verinfo/ver_info.txt |
                    sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                    sed 's/.*JO.\(.*\)/\1/g' | cut -d \- -f 1`
            if [ ! -z $version ]; then
                if [ "$version" \< "3.2" ]; then
                    # For OTA targets, ril-daemon will be defined and for new vendor.ril-daemon
                    # To keep this script agnostic,start both of them as only valid one will start.
                    start ril-daemon
                    start vendor.ril-daemon
                fi
            fi
        else
            start ril-daemon
            start vendor.ril-daemon
        fi
    fi
    # Get ril-daemon status again to ensure that we have latest info
    rild_status=`getprop init.svc.ril-daemon`
    vendor_rild_status=`getprop init.svc.vendor.ril-daemon`
    if [[ -z "$rild_status" || "$rild_status" = "stopped" ]] && [[ -z "$vendor_rild_status" || "$vendor_rild_status" = "stopped" ]]; then
      start vendor.qcrild
    fi
    start vendor.ipacm-diag
    start vendor.ipacm
    case "$baseband" in
@ -60,26 +123,35 @@ case "$baseband" in
              setprop persist.vendor.radio.voice.modem.index 0
          fi
        ;;
        "dsda2")
          setprop persist.radio.multisim.config dsda
    esac
    multisim=`getprop persist.radio.multisim.config`
    if [ "$multisim" = "dsds" ] || [ "$multisim" = "dsda" ]; then
        if [[ -z "$rild_status" || "$rild_status" = "stopped" ]] && [[ -z "$vendor_rild_status" || "$vendor_rild_status" = "stopped" ]]; then
          start vendor.qcrild2
        else
          start vendor.ril-daemon2
        fi
    elif [ "$multisim" = "tsts" ]; then
        if [[ -z "$rild_status" || "$rild_status" = "stopped" ]] && [[ -z "$vendor_rild_status" || "$vendor_rild_status" = "stopped" ]]; then
          start vendor.qcrild2
          start vendor.qcrild3
        else
          start vendor.ril-daemon2
          start vendor.ril-daemon3
        fi
    fi
    case "$datamode" in
        "tethered")
-            start vendor.qti
+            start vendor.dataqti
            start vendor.dataadpl
            start vendor.port-bridge
            ;;
        "concurrent")
-            start vendor.qti
+            start vendor.dataqti
            start vendor.dataadpl
            start vendor.netmgrd
            start vendor.port-bridge
            ;;
@ -91,9 +163,9 @@ esac
 #
 # Allow persistent faking of bms
-# User needs to set fake bms charge in persist.bms.fake_batt_capacity
+# User needs to set fake bms charge in persist.vendor.bms.fake_batt_capacity
 #
-fake_batt_capacity=`getprop persist.bms.fake_batt_capacity`
+fake_batt_capacity=`getprop persist.vendor.bms.fake_batt_capacity`
 case "$fake_batt_capacity" in
    "") ;; #Do nothing here
    * )
--- a/rootdir/bin/init.mdm.sh
+++ b/rootdir/bin/init.mdm.sh
@ -29,6 +29,6 @@
 baseband=`getprop ro.baseband`
 if [ "$baseband" = "mdm" ] || [ "$baseband" = "mdm2" ]; then
-	start mdm_helper
+	start vendor.mdm_helper
 fi
--- a/rootdir/bin/init.qcom.early_boot.sh
+++ b/rootdir/bin/init.qcom.early_boot.sh
@ -1,6 +1,6 @@
 #! /vendor/bin/sh
-# Copyright (c) 2012-2013,2016 The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-2013,2016,2018 The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@ -46,7 +46,14 @@ else
    soc_hwver=`cat /sys/devices/system/soc/soc0/platform_version` 2> /dev/null
 fi
-if [ -f /sys/class/graphics/fb0/virtual_size ]; then
+if [ -f /sys/class/drm/card0-DSI-1/modes ]; then
    echo "detect" > /sys/class/drm/card0-DSI-1/status
    mode_file=/sys/class/drm/card0-DSI-1/modes
    while read line; do
        fb_width=${line%x*};
        break;
    done < $mode_file
 elif [ -f /sys/class/graphics/fb0/virtual_size ]; then
    res=`cat /sys/class/graphics/fb0/virtual_size` 2> /dev/null
    fb_width=${res%,*}
 fi
@ -64,21 +71,24 @@ fi
 function set_density_by_fb() {
    #put default density based on width
    if [ -z $fb_width ]; then
-        setprop ro.sf.lcd_density 320
+        setprop vendor.display.lcd_density 320
    else
-        if [ $fb_width -ge 1440 ]; then
+        if [ $fb_width -ge 1600 ]; then
-           setprop ro.sf.lcd_density 560
+           setprop vendor.display.lcd_density 640
        elif [ $fb_width -ge 1440 ]; then
           setprop vendor.display.lcd_density 560
        elif [ $fb_width -ge 1080 ]; then
-           setprop ro.sf.lcd_density 480
+           setprop vendor.display.lcd_density 480
        elif [ $fb_width -ge 720 ]; then
-           setprop ro.sf.lcd_density 320 #for 720X1280 resolution
+           setprop vendor.display.lcd_density 320 #for 720X1280 resolution
        elif [ $fb_width -ge 480 ]; then
-            setprop ro.sf.lcd_density 240 #for 480X854 QRD resolution
+            setprop vendor.display.lcd_density 240 #for 480X854 QRD resolution
        else
-            setprop ro.sf.lcd_density 160
+            setprop vendor.display.lcd_density 160
        fi
    fi
 }
 target=`getprop ro.board.platform`
 case "$target" in
    "msm7630_surf" | "msm7630_1x" | "msm7630_fusion")
@ -89,7 +99,7 @@ case "$target" in
                ln -s  /system/usr/keychars/surf_keypad_qwerty.kcm.bin /system/usr/keychars/surf_keypad.kcm.bin
                ;;
            "Fluid")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                setprop qcom.bt.dev_power_class 2
                ;;
            *)
@ -101,7 +111,7 @@ case "$target" in
    "msm8660")
        case "$soc_hwplatform" in
            "Fluid")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                ;;
            "Dragon")
                setprop ro.sound.alsa "WM8903"
@ -117,18 +127,18 @@ case "$target" in
                    setprop ro.sf.hwrotation 90
                fi
-                setprop ro.sf.lcd_density 160
+                setprop vendor.display.lcd_density 160
                ;;
            "MTP")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                ;;
            *)
                case "$soc_hwid" in
                    "109")
-                        setprop ro.sf.lcd_density 160
+                        setprop vendor.display.lcd_density 160
                        ;;
                    *)
-                        setprop ro.sf.lcd_density 240
+                        setprop vendor.display.lcd_density 240
                        ;;
                esac
            ;;
@ -151,16 +161,16 @@ case "$target" in
    "msm8974")
        case "$soc_hwplatform" in
            "Liquid")
-                setprop ro.sf.lcd_density 160
+                setprop vendor.display.lcd_density 160
                # Liquid do not have hardware navigation keys, so enable
                # Android sw navigation bar
                setprop ro.hw.nav_keys 0
                ;;
            "Dragon")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                ;;
            *)
-                setprop ro.sf.lcd_density 320
+                setprop vendor.display.lcd_density 320
                ;;
        esac
        ;;
@ -168,7 +178,7 @@ case "$target" in
    "msm8226")
        case "$soc_hwplatform" in
            *)
-                setprop ro.sf.lcd_density 320
+                setprop vendor.display.lcd_density 320
                ;;
        esac
        ;;
@ -176,65 +186,65 @@ case "$target" in
    "msm8610" | "apq8084" | "mpq8092")
        case "$soc_hwplatform" in
            *)
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                ;;
        esac
        ;;
    "apq8084")
        case "$soc_hwplatform" in
            "Liquid")
-                setprop ro.sf.lcd_density 320
+                setprop vendor.display.lcd_density 320
                # Liquid do not have hardware navigation keys, so enable
                # Android sw navigation bar
                setprop ro.hw.nav_keys 0
                ;;
            "SBC")
-                setprop ro.sf.lcd_density 200
+                setprop vendor.display.lcd_density 200
                # SBC do not have hardware navigation keys, so enable
                # Android sw navigation bar
                setprop qemu.hw.mainkeys 0
                ;;
            *)
-                setprop ro.sf.lcd_density 480
+                setprop vendor.display.lcd_density 480
                ;;
        esac
        ;;
    "msm8996")
        case "$soc_hwplatform" in
            "Dragon")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                setprop qemu.hw.mainkeys 0
                ;;
            "ADP")
-                setprop ro.sf.lcd_density 160
+                setprop vendor.display.lcd_density 160
                setprop qemu.hw.mainkeys 0
                ;;
            "SBC")
-                setprop ro.sf.lcd_density 240
+                setprop vendor.display.lcd_density 240
                setprop qemu.hw.mainkeys 0
                ;;
            *)
-                setprop ro.sf.lcd_density 560
+                setprop vendor.display.lcd_density 560
                ;;
        esac
        ;;
    "msm8937" | "msm8940")
-        # Set ro.opengles.version based on chip id.
+        # Set vendor.opengles.version based on chip id.
        # MSM8937 and MSM8940  variants supports OpenGLES 3.1
        # 196608 is decimal for 0x30000 to report version 3.0
        # 196609 is decimal for 0x30001 to report version 3.1
        # 196610 is decimal for 0x30002 to report version 3.2
        case "$soc_hwid" in
-            294|295|296|297|298|313)
+            294|295|296|297|298|313|353|354|363|364)
-                setprop ro.opengles.version 196610
+                setprop vendor.opengles.version 196610
                ;;
            303|307|308|309|320)
                # Vulkan is not supported for 8917 variants
-                setprop ro.opengles.version 196608
+                setprop vendor.opengles.version 196608
                setprop persist.graphics.vulkan.disable true
                ;;
            *)
-                setprop ro.opengles.version 196608
+                setprop vendor.opengles.version 196608
                ;;
        esac
        ;;
@ -248,161 +258,75 @@ case "$target" in
    "msm8998" | "apq8098_latv")
        case "$soc_hwplatform" in
            *)
-                setprop ro.sf.lcd_density 560
+                setprop vendor.display.lcd_density 560
                if [ ! -e /dev/kgsl-3d0 ]; then
                    setprop persist.sys.force_sw_gles 1
                    setprop sdm.idle_time 0
                else
                    setprop persist.sys.force_sw_gles 0
                fi
                ;;
        esac
        case "$soc_hwid" in
                "319") #apq8098_latv
                echo "\n==Loading ALX module==\n"
                insmod /system/lib/modules/alx.ko
                ;;
        esac
        ;;
    "sdm845")
        case "$soc_hwplatform" in
            *)
-                setprop ro.sf.lcd_density 560
+                if [ $fb_width -le 1600 ]; then
-                if [ ! -e /dev/kgsl-3d0 ]; then
+                    setprop vendor.display.lcd_density 560
-                    setprop persist.sys.force_sw_gles 1
+                    setprop dalvik.vm.heapgrowthlimit 256m
                    setprop sdm.idle_time 0
                else
-                    setprop persist.sys.force_sw_gles 0
+                    setprop vendor.display.lcd_density 640
                    setprop dalvik.vm.heapgrowthlimit 512m
                fi
                ;;
        esac
        ;;
    "msmnile")
        case "$soc_hwplatform" in
            *)
                if [ $fb_width -le 1600 ]; then
                    setprop vendor.display.lcd_density 560
                    setprop dalvik.vm.heapgrowthlimit 256m
                else
                    setprop vendor.display.lcd_density 640
                    setprop dalvik.vm.heapgrowthlimit 512m
                fi
                ;;
        esac
        ;;
    "sdm710" | "msmpeafowl")
        case "$soc_hwplatform" in
            *)
                sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc1/sku_version` 2> /dev/null
                if [ $sku_ver -eq 1 ]; then
                    setprop vendor.media.sdm710.version 1
                fi
                ;;
        esac
        ;;
    "msm8953")
        cap_ver = 1
                if [ -e "/sys/devices/platform/soc/1d00000.qcom,vidc/capability_version" ]; then
                    cap_ver=`cat /sys/devices/platform/soc/1d00000.qcom,vidc/capability_version` 2> /dev/null
                else
                    cap_ver=`cat /sys/devices/soc/1d00000.qcom,vidc/capability_version` 2> /dev/null
                fi
                if [ $cap_ver -eq 1 ]; then
-            setprop media.msm8953.version 1
+                    setprop vendor.media.msm8953.version 1
                fi
                ;;
-    "msm8952")
+    #Set property to differentiate SDM660 & SDM455
    #SOC ID for SDM455 is 385
    "sdm660")
        case "$soc_hwid" in
-              278)
+           385)
-                  setprop media.msm8956hw 1
+               setprop vendor.media.sdm660.version 1
                  if [ -f /sys/devices/soc0/platform_version ]; then
                     hw_ver=`cat /sys/devices/soc.0/1d00000.qcom,vidc/version` 2> /dev/null
                     if [ $hw_ver -eq 1 ]; then
                         setprop media.msm8956.version 1
                     fi
                  fi
                  ;;
               266|277)
                    setprop media.msm8956hw 1
                    if [ -f /sys/devices/soc0/platform_version ]; then
                        hw_ver=`cat /sys/devices/soc.0/1d00000.qcom,vidc/version` 2> /dev/null
                        if [ $hw_ver -eq 1 ]; then
                            setprop media.msm8956.version 1
                        fi
                    fi
                    ;;
                264)
                    setprop persist.graphics.vulkan.disable true
                    ;;
        esac
        ;;
 esac
 # In mpss AT version is greater than 3.1, need 
 # to use the new vendor-ril which supports L+L feature 
 # otherwise use the existing old one. 
 if [ -f /firmware/verinfo/ver_info.txt ]; then 
  modem=`cat /firmware/verinfo/ver_info.txt | 
  sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' | 
  sed 's/.*AT.\(.*\)/\1/g' | cut -d \- -f 1` 
  zygote=`getprop ro.zygote` 
  case "$zygote" in 
  "zygote64_32") 
    if [ "$modem" \< "3.1" ]; then 
      setprop vendor.rild.libpath "/vendor/lib64/libril-qc-qmi-1.so" 
    else 
      setprop vendor.rild.libpath "/vendor/lib64/libril-qc-hal-qmi.so" 
    fi
    ;; 
  "zygote32") 
    if [ "$modem" \< "3.1" ]; then 
      setprop vendor.rild.libpath "/vendor/lib/libril-qc-qmi-1.so" 
    else 
      setprop vendor.rild.libpath "/vendor/lib/libril-qc-hal-qmi.so" 
    fi
    ;;
   esac 
 fi
 if [ -f /firmware/verinfo/ver_info.txt ]; then
    # In mpss AT version is greater than 3.1, need
    # to use the new vendor-ril which supports L+L feature
    # otherwise use the existing old one.
    modem=`cat /firmware/verinfo/ver_info.txt |
            sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
            sed 's/.*MPSS.\(.*\)/\1/g' | cut -d \. -f 1`
    if [ "$modem" = "AT" ]; then
        version=`cat /firmware/verinfo/ver_info.txt |
                sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                sed 's/.*AT.\(.*\)/\1/g' | cut -d \- -f 1`
        if [ ! -z $version ]; then
            zygote=`getprop ro.zygote`
            case "$zygote" in
                "zygote64_32")
                    if [ "$version" \< "3.1" ]; then
                        setprop vendor.rild.libpath "/vendor/lib64/libril-qc-qmi-1.so"
                    else
                        setprop vendor.rild.libpath "/vendor/lib64/libril-qc-hal-qmi.so"
                    fi
                    ;;
                "zygote32")
                    if [ "$version" \< "3.1" ]; then
                        echo "legacy qmi load for TA less than 3.1"
                        setprop vendor.rild.libpath "/vendor/lib/libril-qc-qmi-1.so"
                    else
                        setprop vendor.rild.libpath "/vendor/lib/libril-qc-hal-qmi.so"
                    fi
                    ;;
            esac
        fi
    # In mpss TA version is greater than 3.0, need
    # to use the new vendor-ril which supports L+L feature
    # otherwise use the existing old one.
    elif [ "$modem" = "TA" ]; then
        version=`cat /firmware/verinfo/ver_info.txt |
                sed -n 's/^[^:]*modem[^:]*:[[:blank:]]*//p' |
                sed 's/.*TA.\(.*\)/\1/g' | cut -d \- -f 1`
        if [ ! -z $version ]; then
            zygote=`getprop ro.zygote`
            case "$zygote" in
                "zygote64_32")
                    if [ "$version" \< "3.0" ]; then
                        setprop vendor.rild.libpath "/vendor/lib64/libril-qc-qmi-1.so"
                    else
                        setprop vendor.rild.libpath "/vendor/lib64/libril-qc-hal-qmi.so"
                    fi
                    ;;
                "zygote32")
                    if [ "$version" \< "3.0" ]; then
                        setprop vendor.rild.libpath "/vendor/lib/libril-qc-qmi-1.so"
                    else
                        setprop vendor.rild.libpath "/vendor/lib/libril-qc-hal-qmi.so"
                    fi
                    ;;
            esac
        fi
    fi;
 fi
 baseband=`getprop ro.baseband`
 #enable atfwd daemon all targets except sda, apq, qcs
 case "$baseband" in
    "apq" | "sda" | "qcs" )
-        setprop persist.radio.atfwd.start false;;
+        setprop persist.vendor.radio.atfwd.start false;;
    *)
-        setprop persist.radio.atfwd.start true;;
+        setprop persist.vendor.radio.atfwd.start true;;
 esac
 #set default lcd density
@ -411,6 +335,18 @@ esac
 #property if any target is setting forcefully.
 set_density_by_fb
 # set Lilliput LCD density for ADP
 product=`getprop ro.build.product`
 case "$product" in
        "msmnile_au")
         setprop vendor.display.lcd_density 160
         ;;
        *)
        ;;
 esac
 # Setup display nodes & permissions
 # HDMI can be fb1 or fb2
 # Loop through the sysfs nodes and determine
@ -443,10 +379,8 @@ function setHDMIPermission() {
   set_perms $file/pa system.graphics 0664
   set_perms $file/cec/wr_msg system.graphics 0600
   set_perms $file/hdcp/tp system.graphics 0664
   set_perms $file/hdcp2p2/min_level_change system.graphics 0660
   set_perms $file/hdmi_audio_cb audioserver.audio 0600
   set_perms $file/pll_enable system.graphics 0664
   set_perms $file/hdmi_ppm system.graphics 0664
   ln -s $dev_file $dev_gfx_hdmi
 }
@ -476,12 +410,12 @@ then
    file=/sys/class/graphics/fb0/mdp/caps
    if [ -f "$file" ]
    then
-        setprop debug.gralloc.gfx_ubwc_disable 1
+        setprop vendor.gralloc.disable_ubwc 1
        cat $file | while read line; do
          case "$line" in
                    *"ubwc"*)
-                    setprop debug.gralloc.enable_fb_ubwc 1
+                    setprop vendor.gralloc.enable_fb_ubwc 1
-                    setprop debug.gralloc.gfx_ubwc_disable 0
+                    setprop vendor.gralloc.disable_ubwc 0
                esac
        done
    fi
@ -508,23 +442,20 @@ then
            set_perms $file/msm_fb_persist_mode system.graphics 0664
        fi
    done
 else
    set_perms /sys/devices/virtual/hdcp/msm_hdcp/min_level_change system.graphics 0660
 fi
 boot_reason=`cat /proc/sys/kernel/boot_reason`
 reboot_reason=`getprop ro.boot.alarmboot`
 power_off_alarm_file=`cat /mnt/vendor/persist/alarm/powerOffAlarmSet`
 if [ "$boot_reason" = "3" ] || [ "$reboot_reason" = "true" ]; then
-    if [ "$power_off_alarm_file" = "1" ]
+    setprop ro.vendor.alarm_boot true
    then
        setprop ro.alarm_boot true
        setprop debug.sf.nobootanimation 1
    fi
 else
-    setprop ro.alarm_boot false
+    setprop ro.vendor.alarm_boot false
 fi
-# copy GPU frequencies to system property
+# copy GPU frequencies to vendor property
 if [ -f /sys/class/kgsl/kgsl-3d0/gpu_available_frequencies ]; then
    gpu_freq=`cat /sys/class/kgsl/kgsl-3d0/gpu_available_frequencies` 2> /dev/null
-    setprop ro.gpu.available_frequencies "$gpu_freq"
+    setprop vendor.gpu.available_frequencies "$gpu_freq"
 fi
--- a/rootdir/bin/init.qcom.post_boot.sh
+++ b/rootdir/bin/init.qcom.post_boot.sh
--- a/rootdir/bin/init.qcom.sensors.sh
+++ b/rootdir/bin/init.qcom.sensors.sh
@ -0,0 +1,44 @@
 #!/vendor/bin/sh
 # Copyright (c) 2015, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above copyright
 #       notice, this list of conditions and the following disclaimer in the
 #       documentation and/or other materials provided with the distribution.
 #     * Neither the name of The Linux Foundation nor
 #       the names of its contributors may be used to endorse or promote
 #       products derived from this software without specific prior written
 #       permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #
 # Function to start sensors for SSC enabled platforms
 #
 start_sensors()
 {
    chmod -h 664 /persist/sensors/sensors_settings
    chown -h -R system.system /persist/sensors
    start vendor.sensors.qti
    # Only for SLPI
    if [ -c /dev/msm_dsps -o -c /dev/sensors ]; then
        start vendor.sensors
    fi
 }
 start_sensors
--- a/rootdir/bin/init.qcom.sh
+++ b/rootdir/bin/init.qcom.sh
@ -28,6 +28,7 @@
 #
 target=`getprop ro.board.platform`
 low_ram=`getprop ro.config.low_ram`
 if [ -f /sys/devices/soc0/soc_id ]; then
    platformid=`cat /sys/devices/soc0/soc_id`
 else
@ -80,37 +81,13 @@ start_vm_bms()
 }
 start_msm_irqbalance_8939()
 {
 	if [ -f /system/vendor/bin/msm_irqbalance ]; then
 		case "$platformid" in
 		    "239" | "293" | "294" | "295" | "304" | "313")
 			start vendor.msm_irqbalance;;
 		esac
 	fi
 }
 start_msm_irqbalance_8952()
 {
        if [ -f /system/vendor/bin/msm_irqbalance ]; then
                case "$platformid" in
                     "241" | "263" | "264" | "268" | "269" | "270" | "271")
                        start vendor.msm_irqbalance;;
                esac
                case "$platformid" in
                     "266" | "274" | "277" | "278")
                        start vendor.msm_irqbal_lb;;
                esac
 	fi
 }
 start_msm_irqbalance660()
 {
 	if [ -f /vendor/bin/msm_irqbalance ]; then
 		case "$platformid" in
-		    "317" | "324" | "325" | "326" | "345" | "346")
+		    "239" | "293" | "294" | "295" | "304" | "313" |"353")
 			start vendor.msm_irqbalance;;
-		    "318" | "327")
+		    "349" | "350" )
-			start vendor.msm_irqbl_sdm630;;
+			start vendor.msm_irqbal_lb;;
 		esac
 	fi
 }
@ -118,15 +95,12 @@ start_msm_irqbalance660()
 start_msm_irqbalance()
 {
 	if [ -f /vendor/bin/msm_irqbalance ]; then
-		start vendor.msm_irqbalance
+		case "$platformid" in
-	fi
+		    "317" | "324" | "325" | "326" | "345" | "346")
-}
+			start vendor.msm_irqbalance;;
-
+		    "318" | "327" | "385")
-start_copying_prebuilt_qcril_db()
+			start vendor.msm_irqbl_sdm630;;
-{
+		esac
    if [ -f /vendor/radio/qcril_database/qcril.db -a ! -f /data/vendor/radio/qcril.db ]; then
        cp /vendor/radio/qcril_database/qcril.db /data/vendor/radio/qcril.db
        chown -h radio.radio /data/vendor/radio/qcril.db
 	fi
 }
@ -226,7 +200,7 @@ case "$target" in
                  esac
                  ;;
       esac
-        start_msm_irqbalance660
+        start_msm_irqbalance
        ;;
    "apq8084")
        platformvalue=`cat /sys/devices/soc0/hw_platform`
@ -279,7 +253,7 @@ case "$target" in
                  ;;
        esac
        ;;
-    "msm8994" | "msm8992" | "msm8998" | "apq8098_latv" | "sdm845")
+    "msm8994" | "msm8992" | "msm8998" | "apq8098_latv" | "sdm845" | "sdm710" | "qcs605" | "msmnile" | "talos")
        start_msm_irqbalance
        ;;
    "msm8996")
@ -306,60 +280,6 @@ case "$target" in
    "msm8909")
        start_vm_bms
        ;;
    "msm8952")
        start_msm_irqbalance_8952
 	 if [ -f /sys/devices/soc0/soc_id ]; then
             soc_id=`cat /sys/devices/soc0/soc_id`
         else
             soc_id=`cat /sys/devices/system/soc/soc0/id`
         fi
 	 if [ -f /sys/devices/soc0/platform_subtype_id ]; then
 	      platform_subtype_id=`cat /sys/devices/soc0/platform_subtype_id`
 	 fi
 	 if [ -f /sys/devices/soc0/hw_platform ]; then
 	       hw_platform=`cat /sys/devices/soc0/hw_platform`
 	 fi
 	 case "$soc_id" in
 	      "264")
 	           case "$hw_platform" in
 			    "Surf")
 			         case "$platform_subtype_id" in
 			              "1" | "2")
 			                  setprop qemu.hw.mainkeys 0
 			                  ;;
 				  esac
 			          ;;
 			    "MTP")
 			         case "$platform_subtype_id" in
 			              "3")
 			                  setprop qemu.hw.mainkeys 0
 			                  ;;
 				  esac
 			          ;;
 			    "QRD")
 			         case "$platform_subtype_id" in
 			              "0")
 			                  setprop qemu.hw.mainkeys 0
 			                  ;;
 				  esac
 				  ;;
 		     esac
 		     ;;
 		 "266" | "274" | "277" | "278")
 	              case "$hw_platform" in
 			       "Surf" | "RCM")
                                    if [ $panel_xres -eq 1440 ]; then
 				       setprop qemu.hw.mainkeys 0
 				    fi
 				    ;;
 				"MTP" | "QRD")
 				       setprop qemu.hw.mainkeys 0
 				       ;;
 		      esac
 		      ;;
 	esac
 	;;
    "msm8937")
        start_msm_irqbalance_8939
        if [ -f /sys/devices/soc0/soc_id ]; then
@ -373,8 +293,9 @@ case "$target" in
        else
             hw_platform=`cat /sys/devices/system/soc/soc0/hw_platform`
        fi
 	if [ "$low_ram" != "true" ]; then
             case "$soc_id" in
-             "294" | "295" | "303" | "307" | "308" | "309" | "313" | "320")
+                  "294" | "295" | "303" | "307" | "308" | "309" | "313" | "320" | "353" | "354" | "363" | "364")
                       case "$hw_platform" in
                            "Surf")
                                    setprop qemu.hw.mainkeys 0
@ -391,6 +312,7 @@ case "$target" in
                       esac
                       ;;
             esac
        fi
        ;;
    "msm8953")
 	start_msm_irqbalance_8939
@ -406,7 +328,38 @@ case "$target" in
             hw_platform=`cat /sys/devices/system/soc/soc0/hw_platform`
        fi
        case "$soc_id" in
-             "293" | "304" | "338" | "351" )
+             "293" | "304" | "338" | "351" | "349" | "350" )
                  case "$hw_platform" in
                       "Surf")
                                    setprop qemu.hw.mainkeys 0
                                    ;;
                       "MTP")
                                    setprop qemu.hw.mainkeys 0
                                    ;;
                       "RCM")
                                    setprop qemu.hw.mainkeys 0
                                    ;;
                       "QRD")
                                    setprop qemu.hw.mainkeys 0
                                    ;;
                  esac
                  ;;
       esac
        ;;
    "sdm710")
        if [ -f /sys/devices/soc0/soc_id ]; then
            soc_id=`cat /sys/devices/soc0/soc_id`
        else
            soc_id=`cat /sys/devices/system/soc/soc0/id`
        fi
        if [ -f /sys/devices/soc0/hw_platform ]; then
             hw_platform=`cat /sys/devices/soc0/hw_platform`
        else
             hw_platform=`cat /sys/devices/system/soc/soc0/hw_platform`
        fi
        case "$soc_id" in
             "336" | "337" | "347" | "360" )
                  case "$hw_platform" in
                       "Surf")
                                    setprop qemu.hw.mainkeys 0
@ -426,34 +379,29 @@ case "$target" in
        ;;
 esac
 #
 # Copy qcril.db if needed for RIL
 #
 start_copying_prebuilt_qcril_db
 echo 1 > /data/vendor/radio/db_check_done
 #
 # Make modem config folder and copy firmware config to that folder for RIL
 #
-if [ -f /data/vendor/radio/ver_info.txt ]; then
+if [ -f /data/vendor/modem_config/ver_info.txt ]; then
-    prev_version_info=`cat /data/vendor/radio/ver_info.txt`
+    prev_version_info=`cat /data/vendor/modem_config/ver_info.txt`
 else
    prev_version_info=""
 fi
-cur_version_info=`cat /firmware/verinfo/ver_info.txt`
+cur_version_info=`cat /vendor/firmware_mnt/verinfo/ver_info.txt`
-if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
+if [ ! -f /vendor/firmware_mnt/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
-    rm -rf /data/vendor/radio/modem_config
+    # add W for group recursively before delete
-    mkdir /data/vendor/radio/modem_config
+    chmod g+w -R /data/vendor/modem_config/*
-    chmod 770 /data/vendor/radio/modem_config
+    rm -rf /data/vendor/modem_config/*
-    cp -r /firmware/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config
+    # preserve the read only mode for all subdir and files
-    chown -hR radio.radio /data/vendor/radio/modem_config
+    cp --preserve=m -dr /vendor/firmware_mnt/image/modem_pr/mcfg/configs/* /data/vendor/modem_config
-    cp /firmware/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt
+    cp --preserve=m -d /vendor/firmware_mnt/verinfo/ver_info.txt /data/vendor/modem_config/
-    chown radio.radio /data/vendor/radio/ver_info.txt
+    cp --preserve=m -d /vendor/firmware_mnt/image/modem_pr/mbn_ota.txt /data/vendor/modem_config/
    # the group must be root, otherwise this script could not add "W" for group recursively
    chown -hR radio.root /data/vendor/modem_config/*
 fi
-cp /firmware/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config
+chmod g-w /data/vendor/modem_config
-chown radio.radio /data/vendor/radio/modem_config/mbn_ota.txt
+setprop ro.vendor.ril.mbn_copy_completed 1
 echo 1 > /data/vendor/radio/copy_complete
 #check build variant for printk logging
 #current default minimum boot-time-default
--- a/rootdir/bin/init.qcom.usb.sh
+++ b/rootdir/bin/init.qcom.usb.sh
@ -1,5 +1,5 @@
 #!/vendor/bin/sh
-# Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@ -27,8 +27,6 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #
 chown -h root.system /sys/devices/platform/msm_hsusb/gadget/wakeup
 chmod -h 220 /sys/devices/platform/msm_hsusb/gadget/wakeup
 # Set platform variables
 if [ -f /sys/devices/soc0/hw_platform ]; then
@ -43,44 +41,6 @@ else
    soc_machine=`cat /sys/devices/system/soc/soc0/machine` 2> /dev/null
 fi
 # Get hardware revision
 if [ -f /sys/devices/soc0/revision ]; then
    soc_revision=`cat /sys/devices/soc0/revision` 2> /dev/null
 else
    soc_revision=`cat /sys/devices/system/soc/soc0/revision` 2> /dev/null
 fi
 #
 # Allow persistent usb charging disabling
 # User needs to set usb charging disabled in persist.usb.chgdisabled
 #
 target=`getprop ro.board.platform`
 usbchgdisabled=`getprop persist.usb.chgdisabled`
 case "$usbchgdisabled" in
    "") ;; #Do nothing here
    * )
    case $target in
        "msm8660")
        echo "$usbchgdisabled" > /sys/module/pmic8058_charger/parameters/disabled
        echo "$usbchgdisabled" > /sys/module/smb137b/parameters/disabled
 	;;
        "msm8960")
        echo "$usbchgdisabled" > /sys/module/pm8921_charger/parameters/disabled
 	;;
    esac
 esac
 usbcurrentlimit=`getprop persist.usb.currentlimit`
 case "$usbcurrentlimit" in
    "") ;; #Do nothing here
    * )
    case $target in
        "msm8960")
        echo "$usbcurrentlimit" > /sys/module/pm8921_charger/parameters/usb_max_current
 	;;
    esac
 esac
 #
 # Check ESOC for external MDM
 #
@ -89,7 +49,7 @@ esac
 if [ -d /sys/bus/esoc/devices ]; then
 for f in /sys/bus/esoc/devices/*; do
    if [ -d $f ]; then
-        if [ `grep "^MDM" $f/esoc_name` ]; then
+    if [ `grep -e "^MDM" -e "^SDX" $f/esoc_name` ]; then
            esoc_link=`cat $f/esoc_link`
            break
        fi
@ -106,35 +66,128 @@ else
 	soc_id=`cat /sys/devices/system/soc/soc0/id`
 fi
-#
+if [ -f /sys/class/android_usb/f_mass_storage/lun/nofua ]; then
 # Allow USB enumeration with default PID/VID
 #
 baseband=`getprop ro.baseband`
 	echo 1  > /sys/class/android_usb/f_mass_storage/lun/nofua
 fi
-# set USB controller's device node
+#
 # Override USB default composition
 #
 # If USB persist config not set, set default configuration
 miui_release=`getprop ro.fota.oem`
 miui_debuggable=`getprop ro.debuggable`
 if [ "$(getprop persist.vendor.usb.config)" == "" -a \
 	"$(getprop init.svc.vendor.usb-gadget-hal-1-0)" != "running" ]; then
      if [ "$esoc_link" != "" ]; then
 	  setprop persist.vendor.usb.config diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet,adb
      else
 	  case "$(getprop ro.baseband)" in
 	      "apq")
 	          setprop persist.vendor.usb.config diag,adb
 	      ;;
 	      *)
 	      case "$soc_hwplatform" in
 	          "Dragon" | "SBC")
 	              setprop persist.vendor.usb.config diag,adb
 	          ;;
                  *)
 		  soc_machine=${soc_machine:0:3}
 		  case "$soc_machine" in
 		    "SDA")
 	              setprop persist.vendor.usb.config diag,adb
 		    ;;
 		    *)
 	            case "$target" in
 	              "msm8996")
-        setprop sys.usb.controller "6a00000.dwc3"
+	                  setprop persist.vendor.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage,adb
        setprop sys.usb.rndis.func.name "rndis_bam"
 	setprop sys.usb.rmnet.func.name "rmnet_bam"
 		      ;;
-    "msm8998" | "apq8098_latv")
+	              "msm8909")
-        setprop sys.usb.controller "a800000.dwc3"
+		          setprop persist.vendor.usb.config diag,serial_smd,rmnet_qti_bam,adb
        setprop sys.usb.rndis.func.name "gsi"
 	setprop sys.usb.rmnet.func.name "gsi"
 		      ;;
-    "sdm660")
+	              "msm8937")
-        setprop sys.usb.controller "a800000.dwc3"
+			    if [ -d /config/usb_gadget ]; then
-        setprop sys.usb.rndis.func.name "rndis_bam"
+				       setprop persist.vendor.usb.config diag,serial_cdev,rmnet,dpl,adb
-	setprop sys.usb.rmnet.func.name "rmnet_bam"
+			    else
-	echo 15916 > /sys/module/usb_f_qcrndis/parameters/rndis_dl_max_xfer_size
+			               case "$soc_id" in
 				               "313" | "320")
 						  echo BAM2BAM_IPA > /sys/class/android_usb/android0/f_rndis_qc/rndis_transports
 				                  setprop persist.vendor.usb.config diag,serial_smd,rmnet_ipa,adb
 				               ;;
-    "sdm845")
+				               *)
-        setprop sys.usb.controller "a600000.dwc3"
+				                  setprop persist.vendor.usb.config diag,serial_smd,rmnet_qti_bam,adb
-        setprop sys.usb.rndis.func.name "gsi"
+				               ;;
-        setprop sys.usb.rmnet.func.name "gsi"
+			               esac
 			    fi
 		      ;;
 	              "msm8953")
 			      if [ -d /config/usb_gadget ]; then
 				      setprop persist.vendor.usb.config diag,serial_cdev,rmnet,dpl,adb
 			      else
 				      setprop persist.vendor.usb.config diag,serial_smd,rmnet_ipa,adb
 			      fi
 		      ;;
 	              "msm8998" | "sdm660" | "sdm636"| "apq8098_latv")
 					case "$miui_release" in
 						"")
 						case "$miui_debuggable" in
 							"1")
 								setprop persist.vendor.usb.config diag,serial_cdev,rmnet,adb
 							;;
 							*)
 								setprop persist.vendor.usb.config diag,serial_cdev,rmnet
 							;;
 						esac
 						;;
 						*)
 						case "$miui_debuggable" in
 							"1")
 								setprop persist.vendor.usb.config adb
 							;;
 							*)
 								setprop persist.vendor.usb.config none
 							;;
 						esac
 						;;
 				 	 esac
 					;;
 	              "sdm845" | "sdm710")
 		          setprop persist.vendor.usb.config diag,serial_cdev,rmnet,dpl,adb
 		      ;;
 	              "msmnile" | "talos")
 			  setprop persist.vendor.usb.config diag,serial_cdev,rmnet,dpl,qdss,adb
 		      ;;
 	              *)
 		          setprop persist.vendor.usb.config diag,adb
 		      ;;
                    esac
 		    ;;
 		  esac
 	          ;;
 	      esac
 	      ;;
 	  esac
      fi
 fi
 # set rndis transport to BAM2BAM_IPA for 8920 and 8940
 if [ "$target" == "msm8937" ]; then
 	if [ ! -d /config/usb_gadget ]; then
 	   case "$soc_id" in
 		"313" | "320")
 		   echo BAM2BAM_IPA > /sys/class/android_usb/android0/f_rndis_qc/rndis_transports
 		;;
 		*)
 		;;
 	   esac
 	fi
 fi
 # set device mode notification to USB driver for SA8150 Auto ADP
 product=`getprop ro.build.product`
 case "$product" in
 	"msmnile_au")
 	echo peripheral > /sys/bus/platform/devices/a600000.ssusb/mode
         ;;
 	*)
 	;;
@ -142,8 +195,12 @@ esac
 # check configfs is mounted or not
 if [ -d /config/usb_gadget ]; then
 	# Chip-serial is used for unique MSM identification in Product string
 	msm_serial=`cat /sys/devices/soc0/serial_number`;
 	msm_serial_hex=`printf %08X $msm_serial`
 	machine_type=`cat /sys/devices/soc0/machine`
 	product_string="$machine_type-$soc_hwplatform _SN:$msm_serial_hex"
 	echo "$product_string" > /config/usb_gadget/g1/strings/0x409/product
 	# ADB requires valid iSerialNumber; if ro.serialno is missing, use dummy
 	serialnumber=`cat /config/usb_gadget/g1/strings/0x409/serialnumber` 2> /dev/null
@ -151,141 +208,76 @@ if [ -d /config/usb_gadget ]; then
 		serialno=1234567
 		echo $serialno > /config/usb_gadget/g1/strings/0x409/serialnumber
 	fi
 	persist_comp=`getprop persist.sys.usb.config`
 	comp=`getprop sys.usb.config`
 	echo $persist_comp
 	echo $comp
 	if [ "$comp" != "$persist_comp" ]; then
 		echo "setting sys.usb.config"
 		setprop sys.usb.config $persist_comp
 fi
 	setprop sys.usb.configfs 1
 else
 	persist_comp=`getprop persist.sys.usb.config`
 	comp=`getprop sys.usb.config`
 	echo $persist_comp
 	echo $comp
 	if [ "$comp" != "$persist_comp" ]; then
 		echo "setting sys.usb.config"
 		setprop sys.usb.config $persist_comp
 	fi
 fi
 #
 # Do target specific things
 #
 case "$target" in
    "msm8974")
 # Select USB BAM - 2.0 or 3.0
        echo ssusb > /sys/bus/platform/devices/usb_bam/enable
    ;;
    "apq8084")
 	if [ "$baseband" == "apq" ]; then
 		echo "msm_hsic_host" > /sys/bus/platform/drivers/xhci_msm_hsic/unbind
 	fi
    ;;
    "msm8226")
         if [ -e /sys/bus/platform/drivers/msm_hsic_host ]; then
             if [ ! -L /sys/bus/usb/devices/1-1 ]; then
                 echo msm_hsic_host > /sys/bus/platform/drivers/msm_hsic_host/unbind
             fi
         fi
    ;;
    "msm8994" | "msm8992" | "msm8996" | "msm8953")
        echo BAM2BAM_IPA > /sys/class/android_usb/android0/f_rndis_qc/rndis_transports
        echo 131072 > /sys/module/g_android/parameters/mtp_tx_req_len
        echo 131072 > /sys/module/g_android/parameters/mtp_rx_req_len
    ;;
    "msm8937")
 	case "$soc_id" in
 		"313" | "320")
 		   echo BAM2BAM_IPA > /sys/class/android_usb/android0/f_rndis_qc/rndis_transports
 		;;
 	esac
   ;;
 esac
 #
 # set module params for embedded rmnet devices
 #
 rmnetmux=`getprop persist.rmnet.mux`
 case "$baseband" in
    "mdm" | "dsda" | "sglte2")
        case "$rmnetmux" in
            "enabled")
                    echo 1 > /sys/module/rmnet_usb/parameters/mux_enabled
                    echo 8 > /sys/module/rmnet_usb/parameters/no_fwd_rmnet_links
                    echo 17 > /sys/module/rmnet_usb/parameters/no_rmnet_insts_per_dev
            ;;
        esac
        echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init
        # Allow QMUX daemon to assign port open wait time
        chown -h radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait
    ;;
    "dsda2")
          echo 2 > /sys/module/rmnet_usb/parameters/no_rmnet_devs
          echo hsicctl,hsusbctl > /sys/module/rmnet_usb/parameters/rmnet_dev_names
          case "$rmnetmux" in
               "enabled") #mux is neabled on both mdms
                      echo 3 > /sys/module/rmnet_usb/parameters/mux_enabled
                      echo 8 > /sys/module/rmnet_usb/parameters/no_fwd_rmnet_links
                      echo 17 > write /sys/module/rmnet_usb/parameters/no_rmnet_insts_per_dev
               ;;
               "enabled_hsic") #mux is enabled on hsic mdm
                      echo 1 > /sys/module/rmnet_usb/parameters/mux_enabled
                      echo 8 > /sys/module/rmnet_usb/parameters/no_fwd_rmnet_links
                      echo 17 > /sys/module/rmnet_usb/parameters/no_rmnet_insts_per_dev
               ;;
               "enabled_hsusb") #mux is enabled on hsusb mdm
                      echo 2 > /sys/module/rmnet_usb/parameters/mux_enabled
                      echo 8 > /sys/module/rmnet_usb/parameters/no_fwd_rmnet_links
                      echo 17 > /sys/module/rmnet_usb/parameters/no_rmnet_insts_per_dev
               ;;
          esac
          echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init
          # Allow QMUX daemon to assign port open wait time
          chown -h radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait
    ;;
 esac
 #
 # Add support for exposing lun0 as cdrom in mass-storage
 #
 cdromname="/system/etc/cdrom_install.iso"
 platformver=`cat /sys/devices/soc0/hw_platform`
 case "$target" in
 	"msm8226" | "msm8610" | "msm8916")
 		case $platformver in
 			"QRD")
 				echo "mounting usbcdrom lun"
 				echo $cdromname > /sys/class/android_usb/android0/f_mass_storage/rom/file
 				chmod 0444 /sys/class/android_usb/android0/f_mass_storage/rom/file
 				;;
 		esac
 		;;
 esac
 #
 # Initialize RNDIS Diag option. If unset, set it to 'none'.
 #
-diag_extra=`getprop persist.sys.usb.config.extra`
+diag_extra=`getprop persist.vendor.usb.config.extra`
 if [ "$diag_extra" == "" ]; then
-	setprop persist.sys.usb.config.extra none
+	setprop persist.vendor.usb.config.extra none
 fi
 # soc_ids for 8937
 if [ -f /sys/devices/soc0/soc_id ]; then
 	soc_id=`cat /sys/devices/soc0/soc_id`
 else
 	soc_id=`cat /sys/devices/system/soc/soc0/id`
 fi
 # enable rps cpus on msm8937 target
-setprop sys.usb.rps_mask 0
+setprop vendor.usb.rps_mask 0
 case "$soc_id" in
-	"294" | "295")
+	"294" | "295" | "353" | "354")
-		setprop sys.usb.rps_mask 40
+		setprop vendor.usb.rps_mask 40
 	;;
 esac
 #
 # Initialize UVC conifguration.
 #
 if [ -d /config/usb_gadget/g1/functions/uvc.0 ]; then
 	cd /config/usb_gadget/g1/functions/uvc.0
 	echo 3072 > streaming_maxpacket
 	echo 1 > streaming_maxburst
 	mkdir control/header/h
 	ln -s control/header/h control/class/fs/
 	ln -s control/header/h control/class/ss
 	mkdir -p streaming/uncompressed/u/360p
 	echo "666666\n1000000\n5000000\n" > streaming/uncompressed/u/360p/dwFrameInterval
 	mkdir -p streaming/uncompressed/u/720p
 	echo 1280 > streaming/uncompressed/u/720p/wWidth
 	echo 720 > streaming/uncompressed/u/720p/wWidth
 	echo 29491200 > streaming/uncompressed/u/720p/dwMinBitRate
 	echo 29491200 > streaming/uncompressed/u/720p/dwMaxBitRate
 	echo 1843200 > streaming/uncompressed/u/720p/dwMaxVideoFrameBufferSize
 	echo 5000000 > streaming/uncompressed/u/720p/dwDefaultFrameInterval
 	echo "5000000\n" > streaming/uncompressed/u/720p/dwFrameInterval
 	mkdir -p streaming/mjpeg/m/360p
 	echo "666666\n1000000\n5000000\n" > streaming/mjpeg/m/360p/dwFrameInterval
 	mkdir -p streaming/mjpeg/m/720p
 	echo 1280 > streaming/mjpeg/m/720p/wWidth
 	echo 720 > streaming/mjpeg/m/720p/wWidth
 	echo 29491200 > streaming/mjpeg/m/720p/dwMinBitRate
 	echo 29491200 > streaming/mjpeg/m/720p/dwMaxBitRate
 	echo 1843200 > streaming/mjpeg/m/720p/dwMaxVideoFrameBufferSize
 	echo 5000000 > streaming/mjpeg/m/720p/dwDefaultFrameInterval
 	echo "5000000\n" > streaming/mjpeg/m/720p/dwFrameInterval
 	echo 0x04 > /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bmaControls
 	mkdir -p streaming/h264/h/960p
 	echo 1920 > streaming/h264/h/960p/wWidth
 	echo 960 > streaming/h264/h/960p/wWidth
 	echo 40 > streaming/h264/h/960p/bLevelIDC
 	echo "333667\n" > streaming/h264/h/960p/dwFrameInterval
 	mkdir -p streaming/h264/h/1920p
 	echo "333667\n" > streaming/h264/h/1920p/dwFrameInterval
 	mkdir streaming/header/h
 	ln -s streaming/uncompressed/u streaming/header/h
 	ln -s streaming/mjpeg/m streaming/header/h
 	ln -s streaming/h264/h streaming/header/h
 	ln -s streaming/header/h streaming/class/fs/
 	ln -s streaming/header/h streaming/class/hs/
 	ln -s streaming/header/h streaming/class/ss/
 fi
--- a/rootdir/bin/init.qti.qseecomd.sh
+++ b/rootdir/bin/init.qti.qseecomd.sh
@ -31,5 +31,5 @@
 while [ "$registered" != "true" ]
 do
    sleep 0.1
-    registered="`getprop sys.listeners.registered`"
+    registered="`getprop vendor.sys.listeners.registered`"
 done
--- a/rootdir/etc/init.msm.usb.configfs.rc
+++ b/rootdir/etc/init.msm.usb.configfs.rc
@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+# Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@ -25,11 +25,19 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # MIUI ADD
 on property:vold.decrypt=trigger_restart_framework
    setprop sys.usb.config ${persist.sys.usb.config}
 # USB compositions
 on property:sys.usb.config=none && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
 on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "msc"
    rm /config/usb_gadget/g1/configs/b.1/f1
@ -40,6 +48,7 @@ on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0xF000
    symlink /config/usb_gadget/g1/functions/mass_storage.0 /config/usb_gadget/g1/configs/b.1/f1
@ -59,6 +68,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && p
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9015
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
@ -79,6 +89,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,adb && property:
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x901D
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -96,6 +107,7 @@ on property:sys.usb.config=diag && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x900E
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -115,11 +127,12 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,serial_cdev,rmne
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9091
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -134,42 +147,20 @@ on property:sys.usb.config=diag,serial_cdev,rmnet && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9092
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
-on property:sys.usb.config=diag,adb,serial_cdev,serial_nmea,rmnet && property:sys.usb.configfs=1
+on property:vendor.usb.tethering=true
-	start adbd
+    write /sys/class/net/rndis0/queues/rx-0/rps_cpus ${vendor.usb.rps_mask}
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,adb,serial_cdev,serial_nmea,rmnet && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_adb_dun_nmea_rmnet"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9025
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/cser.nmea.1 /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f5
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.tethering=true
    write /sys/class/net/rndis0/queues/rx-0/rps_cpus ${sys.usb.rps_mask}
 on property:sys.usb.config=rndis
-    setprop sys.usb.config rndis,${persist.sys.usb.config.extra}
+    setprop sys.usb.config rndis,${persist.vendor.usb.config.extra}
 on property:sys.usb.config=rndis,none && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis"
@ -181,15 +172,24 @@ on property:sys.usb.config=rndis,none && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x2717
    write /config/usb_gadget/g1/idProduct 0xFF80
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    write /config/usb_gadget/g1/configs/b.1/f1/wceis 1
    setprop sys.usb.state rndis
 on property:sys.usb.config=rndis,sec && property:sys.usb.configfs=1
    write /config/usb_gadget/g2/configs/b.1/strings/0x409/configuration "rndis"
    rm /config/usb_gadget/g2/configs/b.1/f1
    write /config/usb_gadget/g2/idVendor 0x05C6
    write /config/usb_gadget/g2/idProduct 0xF00E
    symlink /config/usb_gadget/g2/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g2/configs/b.1/f1
    write /config/usb_gadget/g2/UDC ${persist.vendor.usb.controller.secondary}
    setprop sys.usb.state rndis
 on property:sys.usb.config=rndis,adb
-    setprop sys.usb.config rndis,${persist.sys.usb.config.extra},adb
+    setprop sys.usb.config rndis,${persist.vendor.usb.config.extra},adb
 on property:sys.usb.config=rndis,none,adb && property:sys.usb.configfs=1
    start adbd
@ -204,9 +204,10 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,none,adb && pro
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x2717
    write /config/usb_gadget/g1/idProduct 0xFF88
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    write /config/usb_gadget/g1/configs/b.1/f1/wceis 1
@ -222,9 +223,10 @@ on property:sys.usb.config=rndis,diag && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x902C
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis
@ -242,9 +244,10 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,adb && pro
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x902D
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@ -260,9 +263,10 @@ on property:sys.usb.config=rndis,serial_cdev && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90B3
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis
@ -280,9 +284,10 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,serial_cdev,adb
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90B4
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@ -298,9 +303,10 @@ on property:sys.usb.config=rndis,serial_cdev,diag && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90B5
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@ -319,9 +325,10 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,serial_cdev,dia
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90B6
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4
@ -338,6 +345,7 @@ on property:sys.usb.config=mtp,diag && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x901B
    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
@ -358,6 +366,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,diag,adb && prope
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x903A
    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
@ -376,6 +385,7 @@ on property:sys.usb.config=diag,qdss && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x904A
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
@ -397,6 +407,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,qdss,adb && prop
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9060
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
@ -416,12 +427,13 @@ on property:sys.usb.config=diag,qdss,rmnet && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9083
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -438,13 +450,14 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,qdss,rmnet,adb &
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9084
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f3
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f4
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -458,10 +471,11 @@ on property:sys.usb.config=rndis,diag,qdss && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9081
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@ -480,10 +494,11 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,qdss,adb &
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9082
    write /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface 1
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4
@ -500,6 +515,7 @@ on property:sys.usb.config=ncm && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0xA4A1
    symlink /config/usb_gadget/g1/functions/ncm.0 /config/usb_gadget/g1/configs/b.1/f1
@ -519,6 +535,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ncm,adb && property:s
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x908C
    symlink /config/usb_gadget/g1/functions/ncm.0 /config/usb_gadget/g1/configs/b.1/f1
@ -536,6 +553,7 @@ on property:sys.usb.config=diag,serial_cdev && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x9004
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -556,6 +574,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,adb,serial_cdev
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x901f
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -574,12 +593,13 @@ on property:sys.usb.config=diag,serial_cdev,rmnet,dpl && property:sys.usb.config
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90b7
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.dpl /config/usb_gadget/g1/configs/b.1/f4
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -596,12 +616,13 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,serial_cdev,rmne
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90b8
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.dpl /config/usb_gadget/g1/configs/b.1/f4
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f5
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -616,11 +637,12 @@ on property:sys.usb.config=rndis,diag,dpl && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90bf
-    symlink /config/usb_gadget/g1/functions/gsi.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.dpl /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis
@ -637,11 +659,12 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,dpl,adb &&
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90c0
-    symlink /config/usb_gadget/g1/functions/gsi.rndis /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.dpl /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis,adb
@ -656,6 +679,7 @@ on property:sys.usb.config=ccid && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90CE
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f1
@ -675,6 +699,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ccid,adb && property:
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90CF
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f1
@ -692,6 +717,7 @@ on property:sys.usb.config=ccid,diag && property:sys.usb.configfs=1
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D0
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f1
@ -712,6 +738,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ccid,diag,adb && prop
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D1
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f1
@ -730,11 +757,12 @@ on property:sys.usb.config=diag,serial_cdev,rmnet,ccid && property:sys.usb.confi
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D2
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -752,11 +780,12 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,serial_cdev,rmne
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D3
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f3
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/ccid.ccid /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f5
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@ -772,6 +801,7 @@ on property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_m
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D7
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -780,7 +810,7 @@ on property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_m
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.2 /config/usb_gadget/g1/configs/b.1/f6
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f7
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
@ -797,6 +827,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qd
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90D8
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
@ -805,11 +836,331 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qd
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.2 /config/usb_gadget/g1/configs/b.1/f6
-    symlink /config/usb_gadget/g1/functions/${sys.usb.rmnet.func.name}.rmnet /config/usb_gadget/g1/configs/b.1/f7
+    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f8
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,dpl,rmnet && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_diag_mdm,qdss_qdss_mdm_dun_dun_mdm_dpl_rmnet"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90DD
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.2 /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f8
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,dpl,rmnet,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,dpl,rmnet,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_diag_mdm,qdss_qdss_mdm_dun_dun_mdm_dpl_rmnet_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90DE
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.2 /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f8
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,serial_cdev,rmnet,dpl,qdss && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_dun_rmnet_dpl_qdss"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90DC
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f5
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,serial_cdev,rmnet,dpl,qdss,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,serial_cdev,rmnet,dpl,qdss,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_dun_rmnet_dpl_qdss_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90DB
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f6
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uac2,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,uac2,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uac2_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90CA
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/uac2.0 /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uac2 && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uac2"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x901C
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/uac2.0 /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uvc,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,uvc,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uvc_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90CB
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/uvc.0 /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uvc && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uvc"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90DF
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/uvc.0 /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uac2,uvc,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,uac2,uvc,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uac2_uvc_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90CC
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/uac2.0 /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/uvc.0 /config/usb_gadget/g1/configs/b.1/f4
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,uac2,uvc && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_uac2_uvc"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90E0
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/uac2.0 /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/uvc.0 /config/usb_gadget/g1/configs/b.1/f3
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_diag_mdm_qdss_qdss_mdm_dun_dpl_rmnet"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90E4
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_diag_mdm_qdss_qdss_mdm_dun_dpl_rmnet_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90E5
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.rmnet.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f8
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis_diag_diag_mdm_qdss_qdss_mdm_dun_dpl"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90E6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis
 on property:sys.usb.config=rndis,diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,adb && property:sys.usb.configfs=1
    start adbd
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis_diag_diag_mdm_qdss_qdss_mdm_dun_dpl_adb"
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
    rm /config/usb_gadget/g1/configs/b.1/f4
    rm /config/usb_gadget/g1/configs/b.1/f5
    rm /config/usb_gadget/g1/configs/b.1/f6
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x05C6
    write /config/usb_gadget/g1/idProduct 0x90E7
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rndis.func.name}.rndis /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/diag.diag /config/usb_gadget/g1/configs/b.1/f2
    symlink /config/usb_gadget/g1/functions/diag.diag_mdm /config/usb_gadget/g1/configs/b.1/f3
    symlink /config/usb_gadget/g1/functions/qdss.qdss /config/usb_gadget/g1/configs/b.1/f4
    symlink /config/usb_gadget/g1/functions/qdss.qdss_mdm /config/usb_gadget/g1/configs/b.1/f5
    symlink /config/usb_gadget/g1/functions/cser.dun.0 /config/usb_gadget/g1/configs/b.1/f6
    symlink /config/usb_gadget/g1/functions/${vendor.usb.rmnet.func.name}.${vendor.usb.dpl.inst.name} /config/usb_gadget/g1/configs/b.1/f7
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f8
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state rndis,adb
 on property:sys.usb.config=adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/idVendor 0x2717
    write /config/usb_gadget/g1/idProduct 0xFF08
@ -861,3 +1212,15 @@ on property:sys.usb.config=midi && property:sys.usb.configfs=1
 on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
    write /config/usb_gadget/g1/idVendor 0x18d1
    write /config/usb_gadget/g1/idProduct 0x4ee9
 on property:vendor.usb.eud=1
    write /config/usb_gadget/g1/configs/b.1/MaxPower 1
    write /sys/module/eud/parameters/enable 1
    write /sys/kernel/debug/pmic-votable/USB_ICL/force_active 1
    write /sys/kernel/debug/pmic-votable/USB_ICL/force_val 500
 on property:vendor.usb.eud=0
    write /sys/kernel/debug/pmic-votable/USB_ICL/force_active 0
    write /sys/kernel/debug/pmic-votable/USB_ICL/force_val 0
    write /config/usb_gadget/g1/configs/b.1/MaxPower 0
    write /sys/module/eud/parameters/enable 0
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
--- a/rootdir/etc/init.qcom.usb.rc
+++ b/rootdir/etc/init.qcom.usb.rc
@ -1,4 +1,4 @@
-# Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.
+# Copyright (c) 2011-2016, 2018 The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@ -41,32 +41,29 @@ on charger
    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100" 
    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "msc" 
    write /config/usb_gadget/g1/idVendor 0x05C6 
    write /config/usb_gadget/g1/idProduct 0xF000 
    symlink /config/usb_gadget/g1/functions/mass_storage.0 /config/usb_gadget/g1/configs/b.1/f1 
    setprop sys.usb.controller "a800000.dwc3" 
    write /config/usb_gadget/g1/UDC ${sys.usb.controller} 
    setprop sys.usb.state ${sys.usb.config}
    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
    write /sys/class/android_usb/android0/f_ffs/aliases adb
-    enable qcom-usb-sh
+    enable vendor.qcom-usb-sh
-    start qcom-usb-sh
+    start vendor.qcom-usb-sh
    setprop sys.usb.config mass_storage
 on boot
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
    mkdir /dev/usb-ffs 0770 shell shell
    mkdir /dev/usb-ffs/adb 0770 shell shell
    mount configfs none /config
-    mkdir /config/usb_gadget/g1 0770 shell shell
+    mkdir /config/usb_gadget/g1 0770
-    mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
+    mkdir /config/usb_gadget/g2 0770
    mkdir /config/usb_gadget/g1/strings/0x409 0770
    mkdir /config/usb_gadget/g2/strings/0x409 0770
    write /config/usb_gadget/g1/bcdUSB 0x0200
    write /config/usb_gadget/g2/bcdUSB 0x0200
    write /config/usb_gadget/g1/os_desc/use 1
    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
    write /config/usb_gadget/g2/strings/0x409/serialnumber ${ro.serialno}
    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
    write /config/usb_gadget/g2/strings/0x409/manufacturer ${ro.product.manufacturer}
    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
    write /config/usb_gadget/g2/strings/0x409/product ${ro.product.model}
    mkdir /config/usb_gadget/g1/functions/mass_storage.0
    mkdir /config/usb_gadget/g1/functions/mtp.gs0
    mkdir /config/usb_gadget/g1/functions/ptp.gs1
@ -85,25 +82,43 @@ on boot
    mkdir /config/usb_gadget/g1/functions/qdss.qdss
    mkdir /config/usb_gadget/g1/functions/qdss.qdss_mdm
    mkdir /config/usb_gadget/g1/functions/rndis_bam.rndis
    mkdir /config/usb_gadget/g1/functions/rndis.rndis
    mkdir /config/usb_gadget/g1/functions/rmnet_bam.rmnet
    mkdir /config/usb_gadget/g1/functions/rmnet_bam.dpl
    mkdir /config/usb_gadget/g1/functions/rmnet_bam.rmnet_bam_dmux
    mkdir /config/usb_gadget/g1/functions/rmnet_bam.dpl_bam_dmux
    mkdir /config/usb_gadget/g1/functions/ncm.0
    mkdir /config/usb_gadget/g1/functions/ccid.ccid
-    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
+    mkdir /config/usb_gadget/g1/functions/uac2.0
-    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
+    mkdir /config/usb_gadget/g1/functions/uvc.0
    mkdir /config/usb_gadget/g1/configs/b.1 0770
    mkdir /config/usb_gadget/g2/configs/b.1 0770
    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770
    mkdir /config/usb_gadget/g2/configs/b.1/strings/0x409 0770
    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
-    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    mkdir /dev/usb-ffs 0775 shell system
    mkdir /dev/usb-ffs/adb 0770 shell system
    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=1000,rmode=0770,fmode=0660
    write /sys/class/android_usb/android0/f_ffs/aliases adb
-    enable qcom-usb-sh
+    setprop vendor.usb.controller ${sys.usb.controller}
-service qcom-usb-sh /vendor/bin/init.qcom.usb.sh
+on load_persist_props_action
    enable vendor.qcom-usb-sh
 service vendor.qcom-usb-sh /vendor/bin/init.qcom.usb.sh
    class core
    user root
    oneshot
    disabled
 on property:persist.vendor.usb.config=*
    setprop persist.sys.usb.config ${persist.vendor.usb.config}
 on boot && property:ro.boot.usbconfigfs=true
        setprop sys.usb.configfs 1
 # Following are the parameters required for usb functionality. They provide configurable options like
 # product_id/vendor id and allows specifying required functions:
 #
@ -424,7 +439,7 @@ on property:sys.usb.config=diag,serial_tty,serial_tty,rmnet_smd,mass_storage,adb
    write /sys/class/android_usb/android0/functions diag,adb,serial,rmnet_smd,mass_storage
    write /sys/class/android_usb/android0/enable 1
    start adbd
-    start port-bridge
+    start vendor.port-bridge
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,acm_tty,acm_tty,rmnet_smd,mass_storage,adb && property:sys.usb.configfs=0
@ -437,7 +452,7 @@ on property:sys.usb.config=diag,acm_tty,acm_tty,rmnet_smd,mass_storage,adb && pr
    write /sys/class/android_usb/android0/functions diag,adb,acm,rmnet_smd,mass_storage
    write /sys/class/android_usb/android0/enable 1
    start adbd
-    start port-bridge
+    start vendor.port-bridge
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,serial_tty,serial_tty,rmnet_smd,mass_storage && property:sys.usb.configfs=0
@ -449,7 +464,7 @@ on property:sys.usb.config=diag,serial_tty,serial_tty,rmnet_smd,mass_storage &&
    write /sys/class/android_usb/android0/f_serial/transports tty,tty
    write /sys/class/android_usb/android0/functions diag,serial,rmnet_smd,mass_storage
    write /sys/class/android_usb/android0/enable 1
-    start port-bridge
+    start vendor.port-bridge
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,acm_tty,acm_tty,rmnet_smd,mass_storage && property:sys.usb.configfs=0
@ -485,7 +500,7 @@ on property:sys.usb.config=diag,acm_smd,acm_tty,rmnet_smd,mass_storage,adb && pr
    write /sys/class/android_usb/android0/functions diag,adb,acm,rmnet_smd,mass_storage
    write /sys/class/android_usb/android0/enable 1
    start adbd
-    start port-bridge
+    start vendor.port-bridge
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,serial_smd,serial_tty,rmnet_smd,mass_storage && property:sys.usb.configfs=0
@ -812,30 +827,30 @@ on property:sys.usb.config=diag,diag_qsc,serial_smd,serial_tty,serial_hsuart,rmn
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
-on property:sys.usb.tethering=true
+on property:vendor.usb.tethering=true
-    write /sys/class/net/rndis0/queues/rx-0/rps_cpus ${sys.usb.rps_mask}
+    write /sys/class/net/rndis0/queues/rx-0/rps_cpus ${vendor.usb.rps_mask}
 on property:sys.usb.config=rndis
-    setprop sys.usb.config rndis,${persist.sys.usb.config.extra}
+    setprop sys.usb.config rndis,${persist.vendor.usb.config.extra}
 on property:sys.usb.config=rndis,none && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF80
+    write /sys/class/android_usb/android0/idProduct F00E
    write /sys/class/android_usb/android0/f_rndis/wceis 1
    write /sys/class/android_usb/android0/functions rndis
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state rndis
 on property:sys.usb.config=rndis,adb && property:sys.usb.configfs=0
-    setprop sys.usb.config rndis,${persist.sys.usb.config.extra},adb
+    setprop sys.usb.config rndis,${persist.vendor.usb.config.extra},adb
 on property:sys.usb.config=rndis,none,adb && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF88
+    write /sys/class/android_usb/android0/idProduct 9024
    write /sys/class/android_usb/android0/f_rndis/wceis 1
    write /sys/class/android_usb/android0/functions rndis,adb
    write /sys/class/android_usb/android0/enable 1
@ -1018,8 +1033,8 @@ on property:sys.usb.config=rndis,diag,diag_mdm,diag_qsc,adb && property:sys.usb.
 on property:sys.usb.config=ptp && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF10
+    write /sys/class/android_usb/android0/idProduct 904D
    write /sys/class/android_usb/android0/functions ptp
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
@ -1027,8 +1042,8 @@ on property:sys.usb.config=ptp && property:sys.usb.configfs=0
 on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF18
+    write /sys/class/android_usb/android0/idProduct 904E
    write /sys/class/android_usb/android0/functions ptp,adb
    write /sys/class/android_usb/android0/enable 1
    start adbd
@ -1037,8 +1052,8 @@ on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=0
 on property:sys.usb.config=mtp && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF40
+    write /sys/class/android_usb/android0/idProduct F003
    write /sys/class/android_usb/android0/functions mtp
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
@ -1046,8 +1061,8 @@ on property:sys.usb.config=mtp && property:sys.usb.configfs=0
 on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF48
+    write /sys/class/android_usb/android0/idProduct 9039
    write /sys/class/android_usb/android0/functions mtp,adb
    write /sys/class/android_usb/android0/enable 1
    start adbd
@ -1345,20 +1360,6 @@ on property:sys.usb.config=diag,diag_mdm,qdss_apq,qdss_mdm,rmnet_hsic && propert
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss_apq,qdss_mdm,rmnet && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
    write /sys/class/android_usb/android0/idVendor 05C6
    write /sys/class/android_usb/android0/idProduct 90A3
    write /sys/class/android_usb/android0/f_diag/clients diag,diag_mdm
    write /sys/class/android_usb/android0/f_rmnet/transports qti,ether
    write /sys/class/android_usb/android0/f_qdss/debug_intf 0
    write /sys/class/android_usb/android0/f_qdss/transports none,bam,none,pcie
    write /sys/class/android_usb/android0/f_qdss/transport_names qdss_bam,qdss_pcie
    write /sys/class/android_usb/android0/functions diag,qdss,rmnet
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss_apq,qdss_mdm,rmnet_hsic,adb && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
@ -1375,22 +1376,6 @@ on property:sys.usb.config=diag,diag_mdm,qdss_apq,qdss_mdm,rmnet_hsic,adb && pro
    start adbd
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=diag,diag_mdm,qdss_apq,qdss_mdm,rmnet,adb && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
    write /sys/class/android_usb/android0/idVendor 05C6
    write /sys/class/android_usb/android0/idProduct 90A2
    write /sys/class/android_usb/android0/f_diag/clients diag,diag_mdm
    write /sys/class/android_usb/android0/f_rmnet/transports qti,ether
    write /sys/class/android_usb/android0/f_qdss/debug_intf 0
    write /sys/class/android_usb/android0/f_qdss/transports none,bam,none,pcie
    write /sys/class/android_usb/android0/f_qdss/transport_names qdss_bam,qdss_pcie
    write /sys/class/android_usb/android0/functions diag,qdss,adb,rmnet
    write /sys/module/dwc3/parameters/tx_fifo_resize_enable 1
    write /sys/class/android_usb/android0/enable 1
    start adbd
    setprop sys.usb.state ${sys.usb.config}
 on property:sys.usb.config=rndis,diag,qdss && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
@ -1511,8 +1496,8 @@ on property:sys.usb.config=ncm,adb && property:sys.usb.configfs=0
 on property:sys.usb.config=charging && property:sys.usb.configfs=0
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/idVendor 2717
+    write /sys/class/android_usb/android0/idVendor 05C6
-    write /sys/class/android_usb/android0/idProduct FF00
+    write /sys/class/android_usb/android0/idProduct F006
    write /sys/class/android_usb/android0/functions charging
    write /sys/class/android_usb/android0/enable 1
    setprop sys.usb.state ${sys.usb.config}
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@ -1,4 +1,4 @@
-# Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
+# Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@ -40,39 +40,20 @@ on init
    write /dev/stune/system-background/schedtune.colocate 0
    write /dev/stune/foreground/schedtune.colocate 0
    write /dev/stune/top-app/schedtune.colocate 1
    chown media media /dev/dbmdx-1
    chmod 0770 /dev/dbmdx-1
 on fs
    wait /dev/block/platform/soc/${ro.boot.bootdevice}
    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
    mount_all /vendor/etc/fstab.qcom
    swapon_all /vendor/etc/fstab.qcom
    # Set permissions for persist partition
    chown root system /mnt/vendor/persist
    chmod 0771 /mnt/vendor/persist
    mkdir /mnt/vendor/persist/bms 0700 root system
    mkdir /mnt/vendor/persist/data 0700 system system
-    mkdir /mnt/vendor/persist/hvdcp_opti 0770 root system
+    mkdir /mnt/vendor/persist/bms 0700 root system
    restorecon_recursive /mnt/vendor/persist
    # Keeping following partitions outside fstab file. As user may not have
    # these partition flashed on the device. Failure to mount any partition in fstab file
    # results in failure to launch late-start class.
    mkdir /vendor/mnt/persist/data 0700 system system
    mkdir /vendor/mnt/persist/bms 0700 root system
    restorecon_recursive /vendor/mnt/persist
    mkdir /vendor/mnt/persist/wlan_bt 0777 root system
    #add by Quanyu.Lee for MI-feature
    #only needed on Factory version,DO NOT push to MIUI!
    chmod 0644 /vendor/mnt/persist/wlan_bt/bt.mac
    chmod 0644 /vendor/mnt/persist/wlan_bt/wlan.mac
    chown system system /vendor/mnt/persist/wlan_bt/bt.mac
    chown system system /vendor/mnt/persist/wlan_bt/wlan.mac
    write /sys/kernel/boot_adsp/boot 1
    chown system system /dev/goodix_fp
    #chmod 0644 /dev/goodix_fp
    chmod 0664 /sys/class/thermal/thermal_message/sconfig
    chown system system /sys/class/thermal/thermal_message/sconfig
@ -80,6 +61,7 @@ on fs
 on post-fs
    start vendor.qseecomd
    exec - system system -- /vendor/bin/init.qti.qseecomd.sh
    write /dev/ipa 1
 on init
    write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
@ -89,43 +71,57 @@ on post-fs-data
    mkdir /data/tombstones/lpass 0771 system system
    mkdir /data/tombstones/wcnss 0771 system system
    mkdir /data/tombstones/dsps 0771 system system
-    mkdir /vendor/mnt/persist/qti_fp 0700 system system
+#D2SP has no hbtp feature
 #    mkdir /data/vendor/hbtp 0750 system system
 #end
    mkdir /data/misc/seemp 0700 system system
-    mkdir /data/misc/tloc 0700 system drmrpc
+    mkdir /data/vendor/tloc 0700 system drmrpc
-    mkdir /data/thermal 0771 system system
+    start pa-cal-load
-    mkdir /data/thermal/config 0771 system system
+#Creat charger logg
    mkdir /data/vendor/charge_logger 0771 system system
 on boot
-    start vendor.rmt_storage
+    start rmt_storage
    start rfs_access
    write /dev/cpuset/top-app/cpus 0-7
    write /dev/cpuset/foreground/cpus 0-7
    write /dev/cpuset/foreground/boost/cpus 0-7
    write /dev/cpuset/background/cpus 0-7
    write /dev/cpuset/system-background/cpus 0-7
    write /dev/cpuset/restricted/cpus 0-7
    ####Regionalization config and prop files####
-    chmod 0644 /vendor/mnt/persist/speccfg/spec
+    chmod 0644 /persist/speccfg/spec
-    chmod 0644 /vendor/mnt/persist/speccfg/devicetype
+    chmod 0644 /persist/speccfg/devicetype
-    chmod 0644 /vendor/mnt/persist/speccfg/mbnversion
+    chmod 0644 /persist/speccfg/mbnversion
-    chmod 0644 /vendor/mnt/persist/speccfg/.not_triggered
+    chmod 0644 /persist/speccfg/.not_triggered
-    chmod 0644 /vendor/mnt/persist/speccfg/vendor_ro.prop
+    chmod 0644 /persist/speccfg/vendor_ro.prop
-    chmod 0644 /vendor/mnt/persist/speccfg/vendor_persist.prop
+    chmod 0644 /persist/speccfg/vendor_persist.prop
-    chmod 0644 /vendor/mnt/persist/speccfg/submask
+    chmod 0644 /persist/speccfg/submask
-    chmod 0644 /vendor/mnt/persist/speccfg/partition
+    chmod 0644 /persist/speccfg/partition
-    chown system system /vendor/mnt/persist/speccfg/spec
+    chown system system /persist/speccfg/spec
-    chown system system /vendor/mnt/persist/speccfg/devicetype
+    chown system system /persist/speccfg/devicetype
-    chown system system /vendor/mnt/persist/speccfg/mbnversion
+    chown system system /persist/speccfg/mbnversion
-    chown system system /vendor/mnt/persist/speccfg/.not_triggered
+    chown system system /persist/speccfg/.not_triggered
-    chown system system /vendor/mnt/persist/speccfg/vendor_ro.prop
+    chown system system /persist/speccfg/vendor_ro.prop
-    chown system system /vendor/mnt/persist/speccfg/vendor_persist.prop
+    chown system system /persist/speccfg/vendor_persist.prop
-    chown system system /vendor/mnt/persist/speccfg/submask
+    chown system system /persist/speccfg/submask
-    chown system system /vendor/mnt/persist/speccfg/partition
+    chown system system /persist/speccfg/partition
    chown system system /mnt/vendor/persist/sensors/sns.reg
 #spk pa-cal lct-20180914   
    chmod 0664 /dev/tiload_node
-    chmod 0660 /proc/nvt_wake_gesture
+#Create folder dump yuv images while debugging
-    chown system system /proc/nvt_wake_gesture
+    mkdir /data/vendor/camera 0770 camera camera
-    # Wifi firmware reload path
+#Load WLAN driver
-    chown wifi wifi /sys/module/wlan/parameters/fwpath
+   insmod /vendor/lib/modules/qca_cld3/qca_cld3_wlan.ko
 #USB controller configuration
    setprop vendor.usb.rndis.func.name "rndis_bam"
    setprop vendor.usb.rmnet.func.name "rmnet_bam"
    setprop vendor.usb.rmnet.inst.name "rmnet"
    setprop vendor.usb.dpl.inst.name "dpl"
    write /sys/module/usb_f_qcrndis/parameters/rndis_dl_max_xfer_size 15916
    setprop sys.usb.configfs 1
 #Peripheral manager
 service vendor.per_mgr /system/vendor/bin/pm-service
@ -140,18 +136,82 @@ service vendor.per_proxy /system/vendor/bin/pm-proxy
    group system
    disabled
-on property:init.svc.per_mgr=running
+on property:init.svc.vendor.per_mgr=running
    start vendor.per_proxy
 on property:sys.shutdown.requested=*
    stop vendor.per_proxy
 on property:sys.thermallct.isincall=1
    write /sys/class/power_supply/battery/device/thermalcall 1
 on property:sys.thermallct.isincall=0
    write /sys/class/power_supply/battery/device/thermalcall 0
 on property:sys.thermallct.isinvideo=1
    write /sys/class/thermal/thermal_message/sconfig 12
 on property:sys.thermallct.isinvideo=0
    write /sys/class/thermal/thermal_message/sconfig 0
 #start camera server as daemon
 #service qcamerasvr /system/bin/mm-qcamera-daemon
 #    class late_start
 #    user camera
 #    group camera system inet input graphics
 ## import cne init file
 #on post-fs
 #    export LD_PRELOAD /vendor/lib/libNimsWrap.so
 #
 ## Allow usb charging to be disabled peristently
 #on property:persist.usb.chgdisabled=1
 #    write /sys/class/power_supply/battery/charging_enabled 0
 #
 #on property:persist.usb.chgdisabled=0
 #    write /sys/class/power_supply/battery/charging_enabled 1
 #
 #service qrngd /system/bin/qrngd -f
 #   class main
 #   user root
 #   group root
 #
 #service qrngp /system/bin/qrngp
 #    class main
 #    user root
 #    group root
 #    oneshot
 #    disabled
 #
 #on property:sys.boot_completed=1
 #    start qrngp
 #
 # add charge_logger service for dump charge message
 service charge_logger /vendor/bin/charge_logger
   class last_start
   user system
   group system system wakelock
   disabled
   oneshot
 on property:sys.boot_completed=1
    start charge_logger
 service vendor.qseecomd /vendor/bin/qseecomd
   class core
   user root
   group root
-service vendor.thermal-engine /system/vendor/bin/thermal-engine
+#service mpdecision /system/vendor/bin/mpdecision --avg_comp
 #   user root
 #   disabled
 #
 #service qosmgrd /system/bin/qosmgr /system/etc/qosmgr_rules.xml
 #   user system
 #   group system
 #   disabled
 #
 service thermal-engine /system/vendor/bin/thermal-engine
   class main
   user root
   socket thermal-send-client stream 0666 system system
@ -160,41 +220,206 @@ service vendor.thermal-engine /system/vendor/bin/thermal-engine
   socket thermal-send-rule stream 0660 system system
   group root
-service vendor.time_daemon /system/vendor/bin/time_daemon
+#service security-check1 /sbin/security_boot_check system
 #    class core
 #    oneshot
 #
 #service security-check2 /sbin/security_boot_check recovery
 #    class core
 #    oneshot
 #
 service time_daemon /system/vendor/bin/time_daemon
   class late_start
   user root
   group root
-service vendor.adsprpcd /system/vendor/bin/adsprpcd audiopd
+service adsprpcd_root /vendor/bin/adsprpcd
   class main
   user media
   group media
 service adsprpcd /vendor/bin/adsprpcd audiopd
   class main
   user media
   group media
 #D2SP has no hbtp feature
 #service hbtp /system/vendor/bin/hbtp_daemon
 #    class main
 #    user system
 #    group system
 #    disabled
 #end
 service audiod /system/vendor/bin/audiod
   class late_start
   user system
   group system
 service vendor.cdsprpcd /vendor/bin/cdsprpcd
   class main
   user system
   group system
   disabled
 #
 #service usf_tester /system/vendor/bin/usf_tester
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_epos /system/vendor/bin/usf_epos
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_gesture /system/vendor/bin/usf_gesture
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_sync_gesture /system/vendor/bin/usf_sync_gesture
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_p2p /system/vendor/bin/usf_p2p
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_hovering /system/vendor/bin/usf_hovering
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf_proximity /system/vendor/bin/usf_proximity
 #    user system
 #    group system inet
 #    disabled
 #
 #service usf-post-boot /system/vendor/bin/sh /system/etc/usf_post_boot.sh
 #    class late_start
 #    user root
 #    disabled
 #    oneshot
 #
 #on property:init.svc.bootanim=stopped
 #    start usf-post-boot
 #
 #
 #on boot
 #    insmod /system/lib/modules/adsprpc.ko
 #    insmod /system/lib/modules/mhi.ko
 ## access permission for secure touch
 #    chmod 0660 /sys/devices/f9966000.i2c/i2c-1/1-004a/secure_touch_enable
 #    chmod 0440 /sys/devices/f9966000.i2c/i2c-1/1-004a/secure_touch
 #    chmod 0660 /sys/devices/f9966000.i2c/i2c-1/1-0020/secure_touch_enable
 #    chmod 0440 /sys/devices/f9966000.i2c/i2c-1/1-0020/secure_touch
 #    chown system drmrpc /sys/devices/f9966000.i2c/i2c-1/1-004a/secure_touch_enable
 #    chown system drmrpc /sys/devices/f9966000.i2c/i2c-1/1-004a/secure_touch
 #    chown system drmrpc /sys/devices/f9966000.i2c/i2c-1/1-0020/secure_touch_enable
 #    chown system drmrpc /sys/devices/f9966000.i2c/i2c-1/1-0020/secure_touch
 #
 #
 #
 ## imsdatadaemon starts with root and UID will be downgraded to SYSTEM.
 service vendor.imsqmidaemon /system/vendor/bin/imsqmidaemon
    class main
    user system
    socket ims_qmid stream 0660 system radio
    group radio log diag
 # imsdatadaemon starts with root and UID will be downgraded to SYSTEM.
 service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon
    class main
    user system
    socket ims_datad stream 0660 system radio
    group system wifi radio inet log diag
    disabled
 #
 #service mdm_helper /system/bin/mdm_helper
 #    class core
 #    onrestart setprop ro.service.mdm_helper_restarted "true"
 #    disabled
 #
 #service mdm_helper_proxy /system/bin/mdm_helper_proxy
 #    class core
 #    disabled
 #
 #service mdm_launcher /system/bin/sh /init.mdm.sh
 #    class main
 #    oneshot
 #
 #service qcamerasvr /system/bin/mm-qcamera-daemon
 #    class late_start
 #    user camera
 #    group camera system inet input graphics
 #
 # Stop mdm_helper_proxy in case of shutdown
 #on property:sys.shutdown.requested=*
 #    stop mdm_helper_proxy
 #
 # Stop mdm_helper_proxy on APQ target
 #on property:ro.radio.noril=yes
 #    stop mdm_helper_proxy
 #
 #on property:persist.airplane.mode.pwr.svg=enabled
 #    setprop ro.mdm_helper_proxy_req false
 #
 #on property:init.svc.ril-daemon=running
 #    setprop ro.mdm_helper_proxy_req true
 #
 ## Start mdm_helper_proxy
 #on property:ro.mdm_helper_proxy_req=true
 #    start mdm_helper_proxy
 #
 ## QCA1530 SoC core detect
 #service gnss-detect /system/vendor/bin/gnss.qca1530.sh detect
 #   class core
 #   oneshot
-service vendor.energy-awareness /system/vendor/bin/energy-awareness
+service energy-awareness /system/vendor/bin/energy-awareness
    class main
    user system
    group system
    oneshot
 service mdtpd /system/vendor/bin/mdtpd
    class late_start
    user root
    group system radio drmrpc
 service vendor.pd_mapper /system/vendor/bin/pd-mapper
     class core
 #
 ## QCA1530 SoC late_start group trigger
 #service gnss-init /system/vendor/bin/gnss.qca1530.sh init
 #   class late_start
 #   oneshot
 #
 ## QCA1530 SoC Service Daemon
 #service gnss-svcd /system/vendor/bin/gnss.qca1530.sh start
 #   class late_start
 #   user root
 #   group gps system qcom_diag diag log inet net_raw
 #   disabled
 on property:vendor.ims.QMI_DAEMON_STATUS=1
    start vendor.imsdatadaemon
 #on property:vold.decrypt=trigger_restart_framework
 #   start cnss_diag
 service cnss_diag /system/vendor/bin/cnss_diag -q -f -t HELIUM
   class main
   user system
   group system wifi inet sdcard_rw media_rw diag
   disabled
 service vendor.ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
   class main
   user system
@ -203,15 +428,13 @@ service vendor.ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
 service vendor.imsrcsservice /system/vendor/bin/imsrcsd
   class main
   user system
-   group radio diag inet log
+   group radio diag inet log wakelock
 # add for HMI_L8866_A01-502: begin
 on property:vendor.ims.DATA_DAEMON_STATUS=1
    restart vendor.ims_rtp_daemon
    setprop persist.rcs.supported 0
 # add for HMI_L8866_A01-502: end
-service vendor.ppd /system/vendor/bin/mm-pp-dpps
+
 service ppd /system/vendor/bin/mm-pp-dpps
    class late_start
    user system
    group system graphics
@ -219,45 +442,267 @@ service vendor.ppd /system/vendor/bin/mm-pp-dpps
    disabled
 on property:init.svc.surfaceflinger=stopped
-    stop vendor.ppd
+    stop ppd
 on property:init.svc.surfaceflinger=running
-    start vendor.ppd
+    start ppd
 on property:init.svc.surfaceflinger=restarting
-    stop vendor.ppd
+    stop ppd
 on property:init.svc.zygote=stopped
-    stop vendor.ppd
+    stop ppd
 on property:init.svc.zygote=running
-    start vendor.ppd
+    start ppd
 on property:init.svc.zygote=restarting
-    stop vendor.ppd
+    stop ppd
 on charger
    load_system_props
-    start vendor.qcom-post-boot
+    start qcom-post-boot
    mkdir /data/vendor/charge_logger 0771 system system
    start vendor.hvdcp_opti
    setprop sys.usb.configfs 1
    start power_off_alarm
    start charge_logger
-service vendor.qfp-daemon /vendor/bin/qfp-daemon
+#
 #service nqs /system/bin/nqs
 #    class late_start
 #    socket nqs_qsb_comm stream 660 system system
 #    user system
 #    group drmrpc
 #
 #service adsprpcd /system/vendor/bin/adsprpcd
 #   class main
 #   user media
 #   group media
 #
 ##Start picture quality tuning service
 #service vqttoolservice /system/bin/vqttoolservice
 #    class late_start
 #    socket vqtss stream 0660 system system
 #    user system
 #    group system
 service seempd /system/bin/seempd
    class late_start
    user system
-    group system drmrpc diag input
+    group system sdcard_rw
    socket seempdw dgram 0666 system system
 service vendor.tlocd /vendor/bin/tloc_daemon
    class late_start
    user system
    group drmrpc gps net_raw
 service vendor.hvdcp_opti /system/vendor/bin/hvdcp_opti
     class main
     user root
     group system wakelock
 service smcinvoked /system/bin/smcinvoked
   class main
   user system
   group system
 #service for su
 service su_daemon /system/xbin/su --daemon
    class main
 # smart pa cal     tsx 08/26
 service pa-cal-load /system/vendor/bin/smart-pa-cal -load
    user root
    group root audio
    disabled
    oneshot
 # smart pa cal     tsx 08/26
 service smart-pa-cal /system/vendor/bin/smart-pa-cal -t 30 -c /system/vendor/etc/speaker.ftcfg -v -u
    user root
    group root audio
    disabled
    oneshot
 on property:odm.pa-cal=0
    stop smart-pa-cal
 on property:odm.pa-cal=1
    start smart-pa-cal
 # audio loopback test begin    tsx 08/26
 service loopback_spk1 /system/vendor/bin/loopback.sh 1 1
    user root
    group root
    disabled
    oneshot
 service loopback_spk0 /system/vendor/bin/loopback.sh 1 0
    user root
    group root
    disabled
    oneshot
 service loopback_rec1 /system/vendor/bin/loopback.sh 2 1
    user root
    group root
    disabled
    oneshot
 service loopback_rec0 /system/vendor/bin/loopback.sh 2 0
    user root
    group root
    disabled
    oneshot
 service loopback_hand1 /system/vendor/bin/loopback.sh 3 1
    user root
    group root
    disabled
    oneshot
 service loopback_hand0 /system/vendor/bin/loopback.sh 3 0
    user root
    group root
    disabled
    oneshot
 service loopback_sec1 /system/vendor/bin/loopback.sh 4 1
    user root
    group root
    disabled
    oneshot
 service loopback_sec0 /system/vendor/bin/loopback.sh 4 0
    user root
    group root
    disabled
    oneshot
 service spk_playback1 /system/vendor/bin/loopback.sh 5 1
    user root
    group root
    disabled
    oneshot
 service spk_playback0 /system/vendor/bin/loopback.sh 5 0
    user root
    group root
    disabled
    oneshot
 #mic1 to rec
 service loopback_mic12rec1 /system/vendor/bin/loopback.sh 11 1
    user root
    group root
    disabled
    oneshot
 service loopback_mic12rec0 /system/vendor/bin/loopback.sh 11 0
    user root
    group root
    disabled
    oneshot
 #mic2 to spk
 service loopback_mic22spk1 /system/vendor/bin/loopback.sh 12 1
    user root
    group root
    disabled
    oneshot
 service loopback_mic22spk0 /system/vendor/bin/loopback.sh 12 0
    user root
    group root
    disabled
    oneshot
 on property:sys.loopback-spk=1
    start loopback_spk1
 on property:sys.loopback-spk=0
    start loopback_spk0
 on property:sys.loopback-rec=1
    start loopback_rec1
 on property:sys.loopback-rec=0
    start loopback_rec0
 on property:sys.loopback-mic1=1
    start loopback_hand1
 on property:sys.loopback-mic1=0
    start loopback_hand0
 on property:sys.loopback-mic2=1
    start loopback_sec1
 on property:sys.loopback-mic2=0
    start loopback_sec0
 on property:sys.spk-playback=1
    start spk_playback1
 on property:sys.spk-playback=0
    start spk_playback0
 #mic1 to rec
 on property:sys.loopback-mic12rec=1
    start loopback_mic12rec1
 on property:sys.loopback-mic12rec=0
    start loopback_mic12rec0
 #mic2 to spk
 on property:sys.loopback-mic22spk=1
    start loopback_mic22spk1
 on property:sys.loopback-mic22spk=0
    start loopback_mic22spk0
 service tinyhostless_spk /system/bin/tinyhostless -D 0 -P 35 -C 11 -p 8 -n 2 -c 1 -r 48000
    user root
    group root
    disabled
    oneshot
 service tinyhostless /system/bin/tinyhostless -D 0 -P 5 -C 11 -p 8 -n 2 -c 1 -r 48000
    user root
    group root
    disabled
    oneshot
 on property:sys.tinyhostless=0
    stop tinyhostless 
 on property:sys.tinyhostless=1
    start tinyhostless
 on property:sys.tinyhostless-spk=0
    stop tinyhostless_spk
 on property:sys.tinyhostless-spk=1
    start tinyhostless_spk
 #audio loopback test end
 on property:persist.sys.display_srgb=1
    write /sys/class/graphics/fb0/msm_fb_srgb 1
 on property:persist.sys.display_srgb=2
    write /sys/class/graphics/fb0/msm_fb_srgb 2
 service adswitch /vendor/bin/adswitch
    user root
    group root
    disabled
    oneshot
 on property:sys.ad.enable=on
    start adswitch
 on property:sys.ad.enable=off
    start adswitch
 on property:sys.dynamic_debug=1
   write /sys/kernel/debug/dynamic_debug/control "file q6afe.c +p" 
   write /sys/kernel/debug/dynamic_debug/control "file q6adm.c +p" 
@ -283,27 +728,3 @@ on property:sys.dynamic_debug=0
   write /sys/kernel/debug/dynamic_debug/control "file msm-analog-cdc.c -p" 
   write /sys/kernel/debug/dynamic_debug/control "file msm-digital-cdc.c -p"
   write /sys/kernel/debug/dynamic_debug/control "file wcd-mbhc-v2.c -p"
 on property:persist.sys.display_ce=4
    write /sys/class/graphics/fb0/msm_fb_ce 1
 on property:persist.sys.display_ce=0
    write /sys/class/graphics/fb0/msm_fb_ce 2
 on property:persist.sys.display_cabc=1
    write /sys/class/graphics/fb0/msm_fb_cabc 1
 on property:persist.sys.display_cabc=2
    write /sys/class/graphics/fb0/msm_fb_cabc 2
 on property:persist.sys.display_gamma=1
    write /sys/class/graphics/fb0/msm_fb_gamma 1
 on property:persist.sys.display_gamma=2
    write /sys/class/graphics/fb0/msm_fb_gamma 2
 on property:sys.antgpio=0
    write /sys/class/ant_class/ant_state 0
 on property:sys.antgpio=1
    write /sys/class/ant_class/ant_state 1
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@ -1,4 +1,4 @@
-# Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-2015, 2017-2018, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@ -25,6 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Firmware directory Path
 # Below macro will be read by uevent and path will
 # be added to search path for firmware loading
 firmware_directories /vendor/firmware_mnt/image/
 # the DIAG device node is not world writable/readable.
 /dev/diag                 0660   system     oem_2901
@ -48,10 +53,9 @@
 /dev/ipaNatTable          0660   radio      radio
 /dev/rmnet_ctrl           0660   usb        usb
 /dev/dpl_ctrl             0660   usb        usb
 /dev/spidev7.1            0660  system 	    system
 /dev/ipa_odl_ctl          0660   radio      radio
 /dev/ipa_adpl             0660   system     oem_2905
-
+/dev/spidev7.1            0660   system	    system
 #permissions for CSVT
 /dev/smd11                0660   radio      radio
@ -112,17 +116,17 @@
 /dev/hsicctl14            0640   radio      radio
 /dev/hsicctl15            0640   radio      radio
 /dev/hsicctl16            0640   radio      radio
-/dev/mhi_pipe_14          0640   radio      radio
+/dev/mhi_*_pipe_14        0640   radio      radio
-/dev/mhi_pipe_16          0640   radio      radio
+/dev/mhi_*_pipe_16        0640   radio      radio
-/dev/mhi_pipe_32          0640   radio      radio
+/dev/mhi_*_pipe_32        0640   radio      radio
 /dev/at_usb0              0640   radio      radio
 /dev/at_mdm0              0640   radio      radio
 /dev/video*               0660   system     camera
 /dev/media*               0660   system     camera
 /dev/v4l-subdev*          0660   system     camera
 /dev/qseecom              0660   system     drmrpc
 /dev/smcinvoke            0660   system     system
 /dev/qce                  0660   system     drmrpc
 /dev/smcinvoke            0660   system     system
 /dev/qsee_ipc_irq_spss    0660   system     drmrpc
 /dev/seemplog             0660   system     system
 /dev/pft                  0660   system     drmrpc
@ -130,18 +134,36 @@
 /dev/sp_kernel            0660   system     system
 /dev/sp_ssr               0660   system     system
 /dev/sp_keymaster         0660   system     system
 /dev/sec_nvm_*            0660   system     system
 /dev/cryptoapp            0660   system     system
 /dev/spdaemon_ssr         0660   system     system
 /dev/gemini0              0660   system     camera
 /dev/jpeg0                0660   system     camera
 /dev/jpeg1                0660   system     camera
 /dev/jpeg2                0660   system     camera
 /dev/jpeg3                0660   system     camera
 /dev/adsprpc-smd          0664   system     system
 /dev/adsprpc-smd-secure   0644   system     system
 /dev/system_health_monitor 0644  radio      system
 /dev/mdss_rotator         0664   system     system
 #QDSS
 /dev/byte-cntr            0660   system    oem_2902
 # fpc fingerprint
 /sys/devices/soc/soc:fpc1020*   hw_reset 0660 system system
 /sys/devices/soc/soc:fpc1020*   irq 0660 system system
 /sys/devices/soc/soc:fpc1020*   wakeup_enable 0660 system system
 /sys/devices/soc/soc:fpc1020*    fingerdown_wait 0220 system system
 /sys/class/leds/red      delay_on     0640    system    system
 /sys/class/leds/red      delay_off    0640    system    system
 /sys/class/leds/red      breath       0640    system    system
 /sys/class/leds/green    delay_on     0640    system    system
 /sys/class/leds/green    delay_off    0640    system    system
 /sys/class/leds/green    breath       0640    system    system
 /sys/class/leds/blue     delay_on     0640    system    system
 /sys/class/leds/blue     delay_off    0640    system    system
 /sys/class/leds/blue     breath       0640    system    system
 # wlan
 /dev/wcnss_wlan           0660   system     system
@ -157,6 +179,7 @@
 /dev/msm_vidc_dec_sec     0660   system     audio
 /dev/msm_vidc_enc         0660   system     audio
 /dev/msm_rotator          0660   system     system
 /dev/hw_random            0600   root       root
 /dev/sdsprpc-smd          0660   system     system
 #permissions for audio
@ -210,6 +233,7 @@
 /dev/tsc_ci0              0660   media       media
 # sensors
 /dev/sensors              0660   system     system
 /sys/devices/i2c-12/12-*  pollrate_ms 0664 system system
 /sys/devices/f9925000.i2c/i2c-0/0-*                 enable         0660    input    system
 /sys/devices/f9925000.i2c/i2c-0/0-*                 poll_delay     0660    input    system
@ -239,6 +263,10 @@
 /sys/devices/soc/78b7000.i2c/i2c-3/3-004b/input/input*    secure_touch_enable  0660   system  drmrpc
 /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input*    secure_touch         0440   system  drmrpc
 /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input*    secure_touch_enable  0660   system  drmrpc
 /sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input*  secure_touch          0440 system drmrpc
 /sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
 /sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch          0440 system drmrpc
 /sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
 # laser sensor access
 /sys/devices/virtual/input/input*                   enable_ps_sensor 0660  system   input
@ -296,6 +324,29 @@
 /dev/block/platform/soc/1da4000.ufshc/by-name/frp       0600   system     system
 /dev/block/platform/soc/c0c4000.sdhci/by-name/frp       0600   system     system
 /dev/block/platform/soc/1d84000.ufshc/by-name/frp       0600   system     system
 /dev/block/platform/soc/7c4000.sdhci/by-name/frp        0600   system     system
 # This is temporary while using SD card for initial bring-up
 /dev/block/platform/soc/8804000.sdhci/by-name/frp       0600   system     system
 # Kmsg device
 /dev/kmsg                                               0620   root       system
 # LED class devices
 /sys/class/leds/red      delay_on     0640    system    system
 /sys/class/leds/red      delay_off    0640    system    system
 /sys/class/leds/red      breath       0640    system    system
 /sys/class/leds/green    delay_on     0640    system    system
 /sys/class/leds/green    delay_off    0640    system    system
 /sys/class/leds/green    breath       0640    system    system
 /sys/class/leds/blue     delay_on     0640    system    system
 /sys/class/leds/blue     delay_off    0640    system    system
 /sys/class/leds/blue     breath       0640    system    system
 # NPU device
 /dev/msm_npu             0644   system     system
 # USB role switch
 /sys/class/dual_role_usb/*	data_role	0660	system	system
 /sys/class/dual_role_usb/*	power_role	0660	system	system
 /sys/class/dual_role_usb/*	mode		0660	system	system
--- a/sensors/sensor_def_qcomdev.conf
+++ b/sensors/sensor_def_qcomdev.conf
@ -4,7 +4,7 @@
 # Tihs file contains default sensor registry values for Qualcomm development
 # test platforms.
 #
-#  Copyright (c) 2013-2016 Qualcomm Technologies, Inc.
+#  Copyright (c) 2013-2017 Qualcomm Technologies, Inc.
 #  All Rights Reserved.
 #  Confidential and Proprietary - Qualcomm Technologies, Inc.
@ -111,8 +111,8 @@
 #
 # The numeric fields are parsed with the strtoull function, base 0.
 #
 :version 0x00010002
 :version 0x00010001
 #######################################################################
 ###        sdm660 Chipsets
 #######################################################################
@ -124,29 +124,30 @@
 :subtype
 # Orientation of sensors
 # accel x/y/z
-700  1 0x00010001 #accel-x-axis
+700  1 0x00010002 #accel-x-axis
-701  -2 0x00010001 #accel-y-axis
+701  -2 0x00010002 #accel-y-axis
-702 -3 0x00010001 #accel-z-axis
+702 -3 0x00010002 #accel-z-axis
 # accel x/y/z
-720  2 0x00010001 #accel-x-axis
+720  2 0x00010002 #accel-x-axis
-721  -1 0x00010001 #accel-y-axis
+721  -1 0x00010002 #accel-y-axis
-722 -3 0x00010001 #accel-z-axis
+722 -3 0x00010002 #accel-z-axis
 # gyro x/y/z
-800  1 0x00010001 #gyro-x-axis
+800  1 0x00010002 #gyro-x-axis
-801  -2 0x00010001 #gyro-y-axis
+801  -2 0x00010002 #gyro-y-axis
-802 -3 0x00010001 #gyro-z-axis
+802 -3 0x00010002 #gyro-z-axis
 # mag x/y/z
-900 -2 0x00010001 #max-x-axis
+900 -2 0x00010002 #max-x-axis
-901  -1 0x00010001 #mag-y-axis
+901  -1 0x00010002 #mag-y-axis
-902  -3 0x00010001 #mag-z-axis
+902  -3 0x00010002 #mag-z-axis
 # SSI SMGR Version
-1900 0 0x00010001 #Maj Ver
+1900 1 0x00010002 #Maj Ver
-1901 2 0x00010001 #Min Ver
+1901 2 0x00010002 #Min Ver
 # SAM config
 #
 203  65536   0x10001 # AMD
 225  983040  0x10001 # RMD
 501  0x40    0x10001 # Gyro_cal_num_samp
 504  65536   0x10001 # Gyro Cal
 1703 65536   0x10001 # Ped
 2800 983040  0x10001 # basic ges
@ -162,466 +163,393 @@
 4103 5 0x10001 # SMD_ACC_WIN_TIME
 #AMD parameters
-200 0x000a0000 0x00010001 #AMD_ACC_SAMP_RATE_HZ_Q16
+200 0x000a0000 0x00010002 #AMD_ACC_SAMP_RATE_HZ_Q16
-201 0x00000cd2 0x00010001 #AMD_INT_cfg_prm1
+201 0x00000cd2 0x00010002 #AMD_INT_cfg_prm1
-202 0x00008000 0x00010001 #AMD_INT_cfg_prm2
+202 0x00008000 0x00010002 #AMD_INT_cfg_prm2
 #RMD parameters
-220 0x001e0000 0x00010001 #RMD_ACC_SAMP_RATE_HZ_Q16
+220 0x001e0000 0x00010002 #RMD_ACC_SAMP_RATE_HZ_Q16
-221 0x0001b333 0x00010001 #RMD_INT_cfg_prm1
+221 0x0001b333 0x00010002 #RMD_INT_cfg_prm1
-222 0x00003333 0x00010001 #RMD_INT_cfg_prm2
+222 0x00003333 0x00010002 #RMD_INT_cfg_prm2
-223 0x00001657 0x00010001 #RMD_INT_cfg_prm3
+223 0x00001657 0x00010002 #RMD_INT_cfg_prm3
-224 0x00003333 0x00010001 #RMD_INT_cfg_prm4
+224 0x00003333 0x00010002 #RMD_INT_cfg_prm4
 # SSI ACC SENSOR
-2000 2 0x00010001               #auto detect
+2000 2 0x00010002               #auto detect
-2001 3 0x00010001               #no. devices
+2001 3 0x00010002               #no. devices
 # SSI SMGR Cfg 0: ICM206xx [INVN ACCEL]
-2002 0xc14075963795c661 0x00010001 #UUID
+2002 0xc14075963795c661 0x00010002 #UUID
-2003 0x0b25b8431bfd46bc 0x00010001 #UUID
+2003 0x0b25b8431bfd46bc 0x00010002 #UUID
-2004 100000 0x00010001             #off_to_idle
+2004 100000 0x00010002             #off_to_idle
-2005 20000 0x00010001              #idle_to_ready
+2005 20000 0x00010002              #idle_to_ready
-2006 68 0x00010001                 #gpio1 [0xFFFF:Polling; 42(0x2A):Acc Interrupt Pin]
+2006 68 0x00010002                 #gpio1 [0xFFFF:Polling; 42(0x2A):Acc Interrupt Pin]
-2007 1000 0x00010001               #reg_group_id
+2007 1000 0x00010002               #reg_group_id
-2008 0 0x00010001                  #cal_grp_id
+2008 0 0x00010002                  #cal_grp_id
-2009 3 0x00010001                  #i2c_bus
+2009 3 0x00010002                  #i2c_bus
-2010 0x68 0x00010001               #i2c_address
+2010 0x68 0x00010002               #i2c_address
-2011 2 0x00010001                  #sens_default
+2011 2 0x00010002                  #sens_default
-2012 0xD0 0x00010001               #flags [0:Polling; 0x80:DRI]
+2012 0xD0 0x00010002               #flags [0:Polling; 0x80:DRI]
-2068 0x83 0x00010001               #vdd [ LDO3B: 3V ]
+2068 0x83 0x00010002               #vdd [ LDO3B: 3V ]
-2069 0x8E 0x00010001               #vddio [ LDO14A: 1.8V]
+2069 0x8E 0x00010002               #vddio [ LDO14A: 1.8V]
 # SSI SMGR Cfg 1: BMI160 ACCEL
-2013 0xd646cb83ec0cd5a5 0x00010001 #UUID
+2013 0xd646cb83ec0cd5a5 0x00010002 #UUID
-2014 0x0f4d0fd654c7eab5 0x00010001 #UUID
+2014 0x0f4d0fd654c7eab5 0x00010002 #UUID
-2015 30000 0x00010001              #off_to_idle
+2015 30000 0x00010002              #off_to_idle
-2016 0 0x00010001                  #idle_to_ready
+2016 0 0x00010002                  #idle_to_ready
-2017 68 0x00010001                 #gpio1
+2017 68 0x00010002                 #gpio1
-2018 1000 0x00010001               #reg_group_id
+2018 1000 0x00010002               #reg_group_id
-2019 0 0x00010001                  #cal_grp_id
+2019 0 0x00010002                  #cal_grp_id
-2020 3 0x00010001                  #i2c_bus
+2020 3 0x00010002                  #i2c_bus
-2021 0x68 0x00010001               #i2c address
+2021 0x68 0x00010002               #i2c address
-2022 4 0x00010001                  #sens_defatult
+2022 4 0x00010002                  #sens_defatult
-2023 0xD0 0x00010001               #flag
+2023 0xD0 0x00010002               #flag
-2070 0x83 0x00010001               #vdd [ LDO3B: 3V ]
+2070 0x83 0x00010002               #vdd [ LDO3B: 3V ]
-2071 0x8E 0x00010001               #vddio [ LDO14A: 1.8V]
+2071 0x8E 0x00010002               #vddio [ LDO14A: 1.8V]
 # SSI SMGR Cfg 1: lsm6dsm ACCEL
-2024 0xbe48af52e826fd3c 0x00010001 #UUID
+2024 0xbe48af52e826fd3c 0x00010002 #UUID
-2025 0x68534cfc401dc2ac 0x00010001 #UUID
+2025 0x68534cfc401dc2ac 0x00010002 #UUID
-2026 100000 0x00010001             #off_to_idle
+2026 100000 0x00010002             #off_to_idle
-2027 250000 0x00010001             #idle_to_ready
+2027 250000 0x00010002             #idle_to_ready
-2028 68 0x00010001                 #gpio1
+2028 68 0x00010002                 #gpio1
-2029 1001 0x00010001               #reg_group_id
+2029 1001 0x00010002               #reg_group_id
-2030 0 0x00010001                  #cal_grp_id
+2030 0 0x00010002                  #cal_grp_id
-2031 3 0x00010001                  #i2c_bus
+2031 3 0x00010002                  #i2c_bus
-2032 0x6a 0x00010001               #i2c address
+2032 0x6a 0x00010002               #i2c address
-2033 4 0x00010001                  #sens_defatult
+2033 4 0x00010002                  #sens_defatult
-2034 0xD0 0x00010001               #flag
+2034 0xD0 0x00010002               #flag
-2072 0x83 0x00010001               #vdd [ LDO3B: 3V ]
+2072 0x83 0x00010002               #vdd [ LDO3B: 3V ]
-2073 0x8E 0x00010001               #vddio [ LDO14A: 1.8V]
+2073 0x8E 0x00010002               #vddio [ LDO14A: 1.8V]
 # SSI G SENSOR
-2100 2 0x00010001               #auto detect
+2100 2 0x00010002               #auto detect
-2101 3 0x00010001               #no. devices
+2101 3 0x00010002               #no. devices
 # SSI SMGR Cfg 0: ICM206xx [INVN GYRO]
-2102 0xc14075963795c661 0x00010001 #UUID
+2102 0xc14075963795c661 0x00010002 #UUID
-2103 0x0b25b8431bfd46bc 0x00010001 #UUID
+2103 0x0b25b8431bfd46bc 0x00010002 #UUID
-2104 100000 0x00010001             #off_to_idle
+2104 100000 0x00010002             #off_to_idle
-2105 80000 0x00010001              #idle_to_ready
+2105 80000 0x00010002              #idle_to_ready
-2106 69 0x00010001                 #gpio1 [0xFFFF:Polling; 42(0x2A):Gyro Interrupt Pin]
+2106 69 0x00010002                 #gpio1 [0xFFFF:Polling; 42(0x2A):Gyro Interrupt Pin]
-2107 1010 0x00010001               #reg_group_id
+2107 1010 0x00010002               #reg_group_id
-2108 10 0x00010001                 #cal_grp_id
+2108 10 0x00010002                 #cal_grp_id
-2109 3 0x00010001                  #i2c_bus
+2109 3 0x00010002                  #i2c_bus
-2110 0x68 0x00010001               #i2c_address
+2110 0x68 0x00010002               #i2c_address
-2111 3 0x00010001                  #sens_default
+2111 3 0x00010002                  #sens_default
-2112 0xD0 0x00010001               #flags [0:Polling; 0x80:DRI]
+2112 0xD0 0x00010002               #flags [0:Polling; 0x80:DRI]
-2168 0x83 0x00010001               #vdd
+2168 0x83 0x00010002               #vdd
-2169 0x8E 0x00010001               #vddio
+2169 0x8E 0x00010002               #vddio
 # SSI SMGR Cfg 1: BMI160 GYRO
-2113 0xd646cb83ec0cd5a5 0x00010001 #UUID
+2113 0xd646cb83ec0cd5a5 0x00010002 #UUID
-2114 0x0f4d0fd654c7eab5 0x00010001 #UUID
+2114 0x0f4d0fd654c7eab5 0x00010002 #UUID
-2115 30000 0x00010001              #off_to_idle
+2115 30000 0x00010002              #off_to_idle
-2116 0 0x00010001                  #idle_to_ready
+2116 0 0x00010002                  #idle_to_ready
-2117 69 0x00010001                 #gpio1
+2117 69 0x00010002                 #gpio1
-2118 1010 0x00010001               #reg_group_id
+2118 1010 0x00010002               #reg_group_id
-2119 10 0x00010001                 #cal_grp_id
+2119 10 0x00010002                 #cal_grp_id
-2120 3 0x00010001                  #i2c_bus
+2120 3 0x00010002                  #i2c_bus
-2121 0x68 0x00010001               #i2c address
+2121 0x68 0x00010002               #i2c address
-2122 4 0x00010001                  #sens_defatult
+2122 4 0x00010002                  #sens_defatult
-2123 0xD0 0x00010001               #flag
+2123 0xD0 0x00010002               #flag
-2170 0x83 0x00010001               #vdd
+2170 0x83 0x00010002               #vdd
-2171 0x8E 0x00010001               #vddio
+2171 0x8E 0x00010002               #vddio
 # SSI SMGR Cfg 1: lsm6dsm GYRO
-2124 0xbe48af52e826fd3c 0x00010001 #UUID
+2124 0xbe48af52e826fd3c 0x00010002 #UUID
-2125 0x68534cfc401dc2ac 0x00010001 #UUID
+2125 0x68534cfc401dc2ac 0x00010002 #UUID
-2126 100000 0x00010001             #off_to_idle
+2126 100000 0x00010002             #off_to_idle
-2127 250000 0x00010001             #idle_to_ready
+2127 250000 0x00010002             #idle_to_ready
-2128 69 0x00010001                 #gpio1
+2128 69 0x00010002                 #gpio1
-2129 1010 0x00010001               #reg_group_id
+2129 1010 0x00010002               #reg_group_id
-2130 10 0x00010001                 #cal_grp_id
+2130 10 0x00010002                 #cal_grp_id
-2131 3 0x00010001                  #i2c_bus
+2131 3 0x00010002                  #i2c_bus
-2132 0x6a 0x00010001               #i2c address
+2132 0x6a 0x00010002               #i2c address
-2133 4 0x00010001                  #sens_defatult
+2133 4 0x00010002                  #sens_defatult
-2134 0xD0 0x00010001               #flag
+2134 0xD0 0x00010002               #flag
-2172 0x83 0x00010001               #vdd
+2172 0x83 0x00010002               #vdd
-2173 0x8E 0x00010001               #vddio
+2173 0x8E 0x00010002               #vddio
 # SSI M SENSOR
-2200 2 0x00010001               #auto detect
+2200 2 0x00010002               #auto detect
-2201 1 0x00010001               #no. devices
+2201 1 0x00010002               #no. devices
 # SSI SMGR Cfg 0: AKM099xx_FIFO mag FIFO/DRI
-2202 0x564d2b94fe80aef6 0x00010001 #UUID
+2202 0x564d2b94fe80aef6 0x00010002 #UUID
-2203 0x90611b98d561168f 0x00010001 #UUID
+2203 0x90611b98d561168f 0x00010002 #UUID
-2204 3000 0x00010001               #off_to_idle
+2204 3000 0x00010002               #off_to_idle
-2205 10000 0x00010001              #idle_to_ready
+2205 10000 0x00010002              #idle_to_ready
-2206 0xFFFF 0x00010001             #gpio1
+2206 0xFFFF 0x00010002             #gpio1
-2207 1020 0x00010001               #reg_group_id
+2207 1020 0x00010002               #reg_group_id
-2208 0xFFFF 0x00010001             #cal_grp_id
+2208 0xFFFF 0x00010002             #cal_grp_id
-2209 3 0x00010001                  #i2c_bus
+2209 3 0x00010002                  #i2c_bus
-2210 0x0c 0x00010001               #i2c address
+2210 0x0c 0x00010002               #i2c address
-2211 0 0x00010001                  #sens_defatult
+2211 0 0x00010002                  #sens_defatult
-2212 0 0x00010001                  #flag
+2212 0 0x00010002                  #flag
-2268 0x83 0x00010001               #vdd
+2268 0x83 0x00010002               #vdd
-2269 0x8E 0x00010001               #vddio
+2269 0x8E 0x00010002               #vddio
 # SSI ALS/PS SENSOR
-2300 2 0x00010001               #auto detect
+2300 2 0x00010002               #auto detect
-2301 2 0x00010001               #no. devices
+2301 1 0x00010002               #no. devices
 # SSI SMGR Cfg 4: LTR578  DRI
-2303 0x014101d151c1e1b1 0x00010001 #UUID should same to ADSP
+2303 0x014101d151c1e1b1 0x00010002 #UUID should same to ADSP
-2302 0xd141c181e101d1a1 0x00010001 #UUID
+2302 0xd141c181e101d1a1 0x00010002 #UUID
-2304 3000 0x00010001               #off_to_idle
+2304 3000 0x00010002               #off_to_idle
-2305 10000 0x00010001                  #idle_to_ready
+2305 10000 0x00010002                  #idle_to_ready
-2306 0xFFFF 0x00010001             #gpio1
+2306 0xFFFF 0x00010002             #gpio1
-2307 1040 0x00010001               #reg_group_id
+2307 1040 0x00010002               #reg_group_id
-2308 0xFFFF 0x00010001             #cal_grp_id
+2308 0xFFFF 0x00010002             #cal_grp_id
-2309 3 0x00010001                  #i2c_bus
+2309 3 0x00010002                  #i2c_bus
-2310 0x53 0x00010001               #i2c_address
+2310 0x53 0x00010002               #i2c_address
-2311 0 0x00010001                  #sens_default
+2311 0 0x00010002                  #sens_default
-2312 0x00 0x00010001               #flags
+2312 0x00 0x00010002               #flags
-2368 0x83 0x00010001                   #vdd
+2368 0x83 0x00010002                   #vdd
-2369 0x8E 0x00010001                   #vddio
+2369 0x8E 0x00010002                   #vddio
 # SSI SMGR Cfg 4: STK3X1X  DRI
 2314 0x8b11a21aa55e6586 0x00010001 #UUID should same to ADSP
 2313 0xa4524f726702e351 0x00010001 #UUID
 2315 7500 0x00010001               #off_to_idle
 2316 10000 0x00010001                  #idle_to_ready
 2317 0xFFFF 0x00010001             #gpio1
 2318 1040 0x00010001               #reg_group_id
 2319 0xFFFF 0x00010001             #cal_grp_id
 2320 3 0x00010001                  #i2c_bus
 2321 0x48 0x00010001               #i2c_address
 2322 0 0x00010001                  #sens_default
 2323 0x00 0x00010001               #flags
 2370 0x83 0x00010001                   #vdd
 2371 0x8E 0x00010001                   #vddio
 #pressure sensor
-2400 2 0x00010001             #min ver
+2400 2 0x00010002             #min ver
-2401 1 0x00010001             #uuid number
+2401 1 0x00010002             #uuid number
 # SSI SMGR Cfg 3: BMP285 pressure POLL
-2403 0x32c31ec17f1c0abd 0x00010001 #UUID
+2403 0x32c31ec17f1c0abd 0x00010002 #UUID
-2402 0x5c473990a806b072 0x00010001 #UUID
+2402 0x5c473990a806b072 0x00010002 #UUID
-2404 5000 0x00010001               #off_to_idle
+2404 5000 0x00010002               #off_to_idle
-2405 50000 0x00010001              #idle_to_ready
+2405 50000 0x00010002              #idle_to_ready
-2406 0xFFFF 0x00010001             #gpio1
+2406 0xFFFF 0x00010002             #gpio1
-2407 0xFFFF 0x00010001             #reg_group_id
+2407 0xFFFF 0x00010002             #reg_group_id
-2408 0xFFFF 0x00010001             #cal_grp_id
+2408 0xFFFF 0x00010002             #cal_grp_id
-2409 3 0x00010001                  #i2c_bus
+2409 3 0x00010002                  #i2c_bus
-2410 0x76 0x00010001               #i2c_address
+2410 0x76 0x00010002               #i2c_address
-2411 0 0x00010001                  #sens_default
+2411 0 0x00010002                  #sens_default
-2412 0 0x00010001                  #flags
+2412 0 0x00010002                  #flags
-2468 0x8E 0x00010001               #vdd
+2468 0x8E 0x00010002               #vdd
-2469 0x8E 0x00010001               #vddio
+2469 0x8E 0x00010002               #vddio
 # SSI SMGR Version
-3600 1 0x00010001 #Maj Ver
+3600 1 0x00010002 #Maj Ver
-3601 2 0x00010001 #Min Ver
+3601 2 0x00010002 #Min Ver
 #RGB sensor
 4300 2 0x00010001             #min ver
 4301 1 0x00010001             #uuid number
 # SSI SMGR Cfg 5: TMG490X RGB DRI
 4303 0x3a83587c79f2d5ad 0x00010001 #UUID
 4302 0xd24fdac0d73b50aa 0x00010001 #UUID
 4304 5700 0x00010001               #off_to_idle
 4305 5000 0x00010001               #idle_to_ready
 4306 0xFFFF 0x00010001             #gpio1
 4307 0xFFFF 0x00010001             #reg_group_id
 4308 0xFFFF 0x00010001             #cal_grp_id
 4309 3 0x00010001                  #i2c_bus
 4310 0x39 0x00010001               #i2c_address
 4311 0 0x00010001                  #sens_default
 4312 0x80 0x00010001               #flags
 4368 0x83 0x00010001               #vdd
 4369 0x8E 0x00010001               #vddio
 #Humidity sensor
 4200 2 0x00010001             #min ver
 4201 1 0x00010001             #uuid number
 ## SSI SMGR Cfg 6: SHTW1 Humidity Onchange
 4203 0xcc631478716da795 0x00010001 #UUID
 4202 0x40410cafc67cfbbe 0x00010001 #UUID
 4204 10000 0x00010001              #off_to_idle
 4205 10000 0x00010001              #idle_to_ready
 4206 0xFFFF 0x00010001             #gpio1
 4207 0xFFFF 0x00010001             #reg_group_id
 4208 0xFFFF 0x00010001             #cal_grp_id
 4209 3 0x00010001                  #i2c_bus
 4210 0x70 0x00010001               #i2c_address
 4211 0 0x00010001                  #sens_default
 4212 0x80 0x00010001               #flags
 4268 1 0x00010001                  #device_select
 4269 0x8E 0x00010001               #vdd
 # Hall Effect BU52053NVX DRI
 4700 2 0x00010001             #min ver
 4701 1 0x00010001             #uuid number
 ## SSI SMGR Cfg 7: Hall Effect BU52053NVX DRI
 4703 0x5da5cb55d3c7bd84 0x00010001 #UUID
 4702 0x7e412494d22ec81e 0x00010001 #UUID
 4704 100 0x00010001                #off_to_idle
 4705 100 0x00010001                #idle_to_ready
 4706 0xFFFF 0x00010001             #gpio1
 4707 0xFFFF 0x00010001             #reg_group_id
 4708 0xFFFF 0x00010001             #cal_grp_id
 4709 3 0x00010001                  #i2c_bus
 4710 0x20 0x00010001               #i2c_address, dummy
 4711 0 0x00010001                  #sens_default
 4712 0x80 0x00010001               #flags
 4768 0x8E 0x00010001               #vdd
 4769 0x8E 0x00010001               #vddio
 #
 # SSI GPIO configuration
 #-----------------------------
-2700  1 0x00010001      #maj ver
+2700  1 0x00010002      #maj ver
-2701  0 0x00010001      #min ver
+2701  0 0x00010002      #min ver
-2706  0xFFFF 0x00010001 #RESET pin
+2706  0xFFFF 0x00010002 #RESET pin
 # Mag Cal config
 #-----------------------------
-3801 1 0x00010001
+3801 1 0x00010002
 3804 0x000a0000 0x10001          #Sample Rate
 #
 # IOD AUTOCAL configuration
 #-----------------------------
-6000  1           0x00010001    #version
+6000  1           0x00010002    #version
-6001  1           0x00010001    #converge staus
+6001  1           0x00010002    #converge staus
-6002  0x3F86CBFB  0x00010001    #coefficient
+6002  0x3F86CBFB  0x00010002    #coefficient
 #
 # SSC GPIO CFG (Unused)
 #-----------------------------
 #
-6300       1 0x00010001 # version
+6300       1 0x00010002 # version
-6301  0x0104 0x00010001 # gpio num
+6301  0x0104 0x00010002 # gpio num
-6302       2 0x00010001 # active func sel
+6302       2 0x00010002 # active func sel
-6303       1 0x00010001 # active dir
+6303       1 0x00010002 # active dir
-6304       0 0x00010001 # active pull
+6304       0 0x00010002 # active pull
-6305       3 0x00010001 # active drive
+6305       3 0x00010002 # active drive
-6306       2 0x00010001 # inactive func sel
+6306       2 0x00010002 # inactive func sel
-6307       0 0x00010001 # inactive dir
+6307       0 0x00010002 # inactive dir
-6308       2 0x00010001 # inactive pull
+6308       2 0x00010002 # inactive pull
-6309       3 0x00010001 # inactive drive
+6309       3 0x00010002 # inactive drive
-6310       1 0x00010001 # version
+6310       1 0x00010002 # version
-6311  0x0105 0x00010001 # gpio num
+6311  0x0105 0x00010002 # gpio num
-6312       2 0x00010001 # active func sel
+6312       2 0x00010002 # active func sel
-6313       1 0x00010001 # active dir
+6313       1 0x00010002 # active dir
-6314       0 0x00010001 # active pull
+6314       0 0x00010002 # active pull
-6315       3 0x00010001 # active drive
+6315       3 0x00010002 # active drive
-6316       2 0x00010001 # inactive func sel
+6316       2 0x00010002 # inactive func sel
-6317       0 0x00010001 # inactive dir
+6317       0 0x00010002 # inactive dir
-6318       2 0x00010001 # inactive pull
+6318       2 0x00010002 # inactive pull
-6319       3 0x00010001 # inactive drive
+6319       3 0x00010002 # inactive drive
-6320       1 0x00010001 # version
+6320       1 0x00010002 # version
-6321  0x0106 0x00010001 # gpio num
+6321  0x0106 0x00010002 # gpio num
-6322       2 0x00010001 # active func sel
+6322       2 0x00010002 # active func sel
-6323       1 0x00010001 # active dir
+6323       1 0x00010002 # active dir
-6324       0 0x00010001 # active pull
+6324       0 0x00010002 # active pull
-6325       3 0x00010001 # active drive
+6325       3 0x00010002 # active drive
-6326       2 0x00010001 # inactive func sel
+6326       2 0x00010002 # inactive func sel
-6327       0 0x00010001 # inactive dir
+6327       0 0x00010002 # inactive dir
-6328       2 0x00010001 # inactive pull
+6328       2 0x00010002 # inactive pull
-6329       3 0x00010001 # inactive drive
+6329       3 0x00010002 # inactive drive
-6330       1 0x00010001 # version
+6330       1 0x00010002 # version
-6331  0x0107 0x00010001 # gpio num
+6331  0x0107 0x00010002 # gpio num
-6332       2 0x00010001 # active func sel
+6332       2 0x00010002 # active func sel
-6333       0 0x00010001 # active dir
+6333       0 0x00010002 # active dir
-6334       0 0x00010001 # active pull
+6334       0 0x00010002 # active pull
-6335       3 0x00010001 # active drive
+6335       3 0x00010002 # active drive
-6336       2 0x00010001 # inactive func sel
+6336       2 0x00010002 # inactive func sel
-6337       0 0x00010001 # inactive dir
+6337       0 0x00010002 # inactive dir
-6338       2 0x00010001 # inactive pull
+6338       2 0x00010002 # inactive pull
-6339       3 0x00010001 # inactive drive
+6339       3 0x00010002 # inactive drive
-6340       1 0x00010001 # version
+6340       1 0x00010002 # version
-6341  0x010C 0x00010001 # gpio num
+6341  0x010C 0x00010002 # gpio num
-6342       1 0x00010001 # active func sel
+6342       1 0x00010002 # active func sel
-6343       1 0x00010001 # active dir
+6343       1 0x00010002 # active dir
-6344       0 0x00010001 # active pull
+6344       0 0x00010002 # active pull
-6345       3 0x00010001 # active drive
+6345       3 0x00010002 # active drive
-6346       1 0x00010001 # inactive func sel
+6346       1 0x00010002 # inactive func sel
-6347       0 0x00010001 # inactive dir
+6347       0 0x00010002 # inactive dir
-6348       2 0x00010001 # inactive pull
+6348       2 0x00010002 # inactive pull
-6349       3 0x00010001 # inactive drive
+6349       3 0x00010002 # inactive drive
-6350       1 0x00010001 # version
+6350       1 0x00010002 # version
-6351  0x010D 0x00010001 # gpio num
+6351  0x010D 0x00010002 # gpio num
-6352       1 0x00010001 # active func sel
+6352       1 0x00010002 # active func sel
-6353       0 0x00010001 # active dir
+6353       0 0x00010002 # active dir
-6354       0 0x00010001 # active pull
+6354       0 0x00010002 # active pull
-6355       3 0x00010001 # active drive
+6355       3 0x00010002 # active drive
-6356       1 0x00010001 # inactive func sel
+6356       1 0x00010002 # inactive func sel
-6357       0 0x00010001 # inactive dir
+6357       0 0x00010002 # inactive dir
-6358       2 0x00010001 # inactive pull
+6358       2 0x00010002 # inactive pull
-6359       3 0x00010001 # inactive drive
+6359       3 0x00010002 # inactive drive
-6360       1 0x00010001 # version
+6360       1 0x00010002 # version
-6361  0x010E 0x00010001 # gpio num
+6361  0x010E 0x00010002 # gpio num
-6362       1 0x00010001 # active func sel
+6362       1 0x00010002 # active func sel
-6363       1 0x00010001 # active dir
+6363       1 0x00010002 # active dir
-6364       0 0x00010001 # active pull
+6364       0 0x00010002 # active pull
-6365       3 0x00010001 # active drive
+6365       3 0x00010002 # active drive
-6366       1 0x00010001 # inactive func sel
+6366       1 0x00010002 # inactive func sel
-6367       0 0x00010001 # inactive dir
+6367       0 0x00010002 # inactive dir
-6368       2 0x00010001 # inactive pull
+6368       2 0x00010002 # inactive pull
-6369       3 0x00010001 # inactive drive
+6369       3 0x00010002 # inactive drive
-6490       1 0x00010001 # version
+6490       1 0x00010002 # version
-6491  0x010F 0x00010001 # gpio num
+6491  0x010F 0x00010002 # gpio num
-6492       1 0x00010001 # active func sel
+6492       1 0x00010002 # active func sel
-6493       0 0x00010001 # active dir
+6493       0 0x00010002 # active dir
-6494       0 0x00010001 # active pull
+6494       0 0x00010002 # active pull
-6495       3 0x00010001 # active drive
+6495       3 0x00010002 # active drive
-6496       1 0x00010001 # inactive func sel
+6496       1 0x00010002 # inactive func sel
-6497       0 0x00010001 # inactive dir
+6497       0 0x00010002 # inactive dir
-6498       2 0x00010001 # inactive pull
+6498       2 0x00010002 # inactive pull
-6499       3 0x00010001 # inactive drive
+6499       3 0x00010002 # inactive drive
-6370       1 0x00010001 # version
+6370       1 0x00010002 # version
-6371  0x0110 0x00010001 # gpio num
+6371  0x0110 0x00010002 # gpio num
-6372       1 0x00010001 # active func sel
+6372       1 0x00010002 # active func sel
-6373       1 0x00010001 # active dir
+6373       1 0x00010002 # active dir
-6374       0 0x00010001 # active pull
+6374       0 0x00010002 # active pull
-6375       3 0x00010001 # active drive
+6375       3 0x00010002 # active drive
-6376       1 0x00010001 # inactive func sel
+6376       1 0x00010002 # inactive func sel
-6377       0 0x00010001 # inactive dir
+6377       0 0x00010002 # inactive dir
-6378       2 0x00010001 # inactive pull
+6378       2 0x00010002 # inactive pull
-6379       3 0x00010001 # inactive drive
+6379       3 0x00010002 # inactive drive
-6380       1 0x00010001 # version
+6380       1 0x00010002 # version
-6381  0x0111 0x00010001 # gpio num
+6381  0x0111 0x00010002 # gpio num
-6382       1 0x00010001 # active func sel
+6382       1 0x00010002 # active func sel
-6383       1 0x00010001 # active dir
+6383       1 0x00010002 # active dir
-6384       0 0x00010001 # active pull
+6384       0 0x00010002 # active pull
-6385       3 0x00010001 # active drive
+6385       3 0x00010002 # active drive
-6386       1 0x00010001 # inactive func sel
+6386       1 0x00010002 # inactive func sel
-6387       0 0x00010001 # inactive dir
+6387       0 0x00010002 # inactive dir
-6388       2 0x00010001 # inactive pull
+6388       2 0x00010002 # inactive pull
-6389       3 0x00010001 # inactive drive
+6389       3 0x00010002 # inactive drive
 #
 # SSC GPIO CFG (Used)
 #-----------------------------
-6420       1 0x00010001 # version
+6420       1 0x00010002 # version
-6421  0x0100 0x00010001 # gpio num
+6421  0x0100 0x00010002 # gpio num
-6422       1 0x00010001 # active func sel
+6422       1 0x00010002 # active func sel
-6423       1 0x00010001 # active dir
+6423       1 0x00010002 # active dir
-6424       0 0x00010001 # active pull
+6424       0 0x00010002 # active pull
-6425       0 0x00010001 # active drive
+6425       0 0x00010002 # active drive
-6426       1 0x00010001 # inactive func sel
+6426       1 0x00010002 # inactive func sel
-6427       0 0x00010001 # inactive dir
+6427       0 0x00010002 # inactive dir
-6428       2 0x00010001 # inactive pull
+6428       2 0x00010002 # inactive pull
-6429       0 0x00010001 # inactive drive
+6429       0 0x00010002 # inactive drive
-6430       1 0x00010001 # version
+6430       1 0x00010002 # version
-6431  0x0102 0x00010001 # gpio num
+6431  0x0102 0x00010002 # gpio num
-6432       1 0x00010001 # active func sel
+6432       1 0x00010002 # active func sel
-6433       1 0x00010001 # active dir
+6433       1 0x00010002 # active dir
-6434       0 0x00010001 # active pull
+6434       0 0x00010002 # active pull
-6435       0 0x00010001 # active drive
+6435       0 0x00010002 # active drive
-6436       1 0x00010001 # inactive func sel
+6436       1 0x00010002 # inactive func sel
-6437       0 0x00010001 # inactive dir
+6437       0 0x00010002 # inactive dir
-6438       2 0x00010001 # inactive pull
+6438       2 0x00010002 # inactive pull
-6439       0 0x00010001 # inactive drive
+6439       0 0x00010002 # inactive drive
-6440       1 0x00010001 # version
+6440       1 0x00010002 # version
-6441  0x0103 0x00010001 # gpio num
+6441  0x0103 0x00010002 # gpio num
-6442       1 0x00010001 # active func sel
+6442       1 0x00010002 # active func sel
-6443       1 0x00010001 # active dir
+6443       1 0x00010002 # active dir
-6444       0 0x00010001 # active pull
+6444       0 0x00010002 # active pull
-6445       0 0x00010001 # active drive
+6445       0 0x00010002 # active drive
-6446       1 0x00010001 # inactive func sel
+6446       1 0x00010002 # inactive func sel
-6447       0 0x00010001 # inactive dir
+6447       0 0x00010002 # inactive dir
-6448       2 0x00010001 # inactive pull
+6448       2 0x00010002 # inactive pull
-6449       0 0x00010001 # inactive drive
+6449       0 0x00010002 # inactive drive
-6450       1 0x00010001 # version
+6450       1 0x00010002 # version
-6451  0x0108 0x00010001 # gpio num
+6451  0x0108 0x00010002 # gpio num
-6452       1 0x00010001 # active func sel
+6452       1 0x00010002 # active func sel
-6453       1 0x00010001 # active dir
+6453       1 0x00010002 # active dir
-6454       0 0x00010001 # active pull
+6454       0 0x00010002 # active pull
-6455       3 0x00010001 # active drive
+6455       3 0x00010002 # active drive
-6456       1 0x00010001 # inactive func sel
+6456       1 0x00010002 # inactive func sel
-6457       0 0x00010001 # inactive dir
+6457       0 0x00010002 # inactive dir
-6458       2 0x00010001 # inactive pull
+6458       2 0x00010002 # inactive pull
-6459       3 0x00010001 # inactive drive
+6459       3 0x00010002 # inactive drive
-6460       1 0x00010001 # version
+6460       1 0x00010002 # version
-6461  0x0109 0x00010001 # gpio num
+6461  0x0109 0x00010002 # gpio num
-6462       1 0x00010001 # active func sel
+6462       1 0x00010002 # active func sel
-6463       1 0x00010001 # active dir
+6463       1 0x00010002 # active dir
-6464       0 0x00010001 # active pull
+6464       0 0x00010002 # active pull
-6465       3 0x00010001 # active drive
+6465       3 0x00010002 # active drive
-6466       1 0x00010001 # inactive func sel
+6466       1 0x00010002 # inactive func sel
-6467       0 0x00010001 # inactive dir
+6467       0 0x00010002 # inactive dir
-6468       2 0x00010001 # inactive pull
+6468       2 0x00010002 # inactive pull
-6469       3 0x00010001 # inactive drive
+6469       3 0x00010002 # inactive drive
-6470       1 0x00010001 # version
+6470       1 0x00010002 # version
-6471  0x010A 0x00010001 # gpio num
+6471  0x010A 0x00010002 # gpio num
-6472       1 0x00010001 # active func sel
+6472       1 0x00010002 # active func sel
-6473       1 0x00010001 # active dir
+6473       1 0x00010002 # active dir
-6474       0 0x00010001 # active pull
+6474       0 0x00010002 # active pull
-6475       3 0x00010001 # active drive
+6475       3 0x00010002 # active drive
-6476       1 0x00010001 # inactive func sel
+6476       1 0x00010002 # inactive func sel
-6477       0 0x00010001 # inactive dir
+6477       0 0x00010002 # inactive dir
-6478       2 0x00010001 # inactive pull
+6478       2 0x00010002 # inactive pull
-6479       3 0x00010001 # inactive drive
+6479       3 0x00010002 # inactive drive
 6480       1 0x00010001 # version
 6481  0x010B 0x00010001 # gpio num
 6482       1 0x00010001 # active func sel
 6483       0 0x00010001 # active dir
 6484       0 0x00010001 # active pull
 6485       3 0x00010001 # active drive
 6486       1 0x00010001 # inactive func sel
 6487       0 0x00010001 # inactive dir
 6488       2 0x00010001 # inactive pull
 6489       3 0x00010001 # inactive drive
 6480       1 0x00010002 # version
 6481  0x010B 0x00010002 # gpio num
 6482       1 0x00010002 # active func sel
 6483       0 0x00010002 # active dir
 6484       0 0x00010002 # active pull
 6485       3 0x00010002 # active drive
 6486       1 0x00010002 # inactive func sel
 6487       0 0x00010002 # inactive dir
 6488       2 0x00010002 # inactive pull
 6489       3 0x00010002 # inactive drive
--- a/vendor_framework_compatibility_matrix.xml
+++ b/vendor_framework_compatibility_matrix.xml
@ -59,14 +59,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        </interface>
    </hal>
    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
+        <name>vendor.qti.hardware.factory</name>
        <version>1.0</version>
        <interface>
-            <name>IAppConnector</name>
+            <name>IFactory</name>
            <instance>default</instance>
        </interface>
        <interface>
            <name>IGPAppConnector</name>
            <instance>default</instance>
        </interface>
    </hal>
@ -78,14 +74,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>dpmQmiService</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="true">
        <name>android.hardware.nfc</name>
        <version>1.0</version>
        <interface>
            <name>INfc</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="true">
        <name>android.hardware.radio.deprecated</name>
        <version>1.0</version>
@ -221,22 +209,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.qti.hardware.iop</name>
        <version>2.0</version>
        <interface>
            <name>IIop</name>
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.qti.hardware.qdutils_disp</name>
        <version>1.0</version>
        <interface>
            <name>IQdutilsDisp</name>
            <instance>default</instance>
        </interface>
    </hal>
   <hal format="hidl" optional="true">
       <name>vendor.qti.hardware.radio.am</name>
       <version>1.0</version>
@ -248,7 +220,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   </hal>
    <hal format="hidl" optional="true">
        <name>vendor.qti.hardware.radio.ims</name>
-           <version>1.0-3</version>
+           <version>1.0-4</version>
           <interface>
               <name>IImsRadio</name>
               <instance>imsradio0</instance>
@ -285,6 +257,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <hal format="hidl" optional="true">
        <name>vendor.qti.hardware.radio.qtiradio</name>
        <version>1.0</version>
        <version>2.0</version>
        <interface>
            <name>IQtiRadio</name>
            <instance>slot1</instance>
@ -311,7 +284,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </hal>
    <hal format="hidl" optional="true">
        <name>vendor.qti.hardware.radio.uim</name>
-        <version>1.0</version>
+        <version>1.1</version>
        <interface>
            <name>IUim</name>
            <instance>Uim0</instance>
@ -392,7 +365,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </hal>
    <hal format="hidl" optional="true">
        <name>android.hardware.gnss</name>
-        <version>1.1</version>
+        <version>1.0</version>
        <interface>
            <name>IGnss</name>
            <instance>gnss_vendor</instance>
--- a/wayne.mk
+++ b/wayne.mk
@ -260,6 +260,7 @@ PRODUCT_PACKAGES += \
    init.msm.usb.configfs.rc \
    init.qcom.early_boot.sh \
    init.qcom.post_boot.sh \
    init.qcom.sensors.sh \
    init.qcom.rc \
    init.qcom.sh \
    init.qcom.usb.rc \
@ -370,6 +371,9 @@ PRODUCT_PACKAGES += \
 # RIL
 PRODUCT_PACKAGES += \
    android.hardware.radio@1.2 \
    android.hardware.radio.config@1.0 \
    android.hardware.secure_element@1.0 \
    rild \
    librmnetctl \
    libxml2 \