diff --git a/Android.mk b/Android.mk
index f80d7db..704927c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,3 @@
- 
 #
 # Copyright (C) 2016 The CyanogenMod Project
 #
diff --git a/vendorsetup.sh b/AndroidProducts.mk
similarity index 72%
rename from vendorsetup.sh
rename to AndroidProducts.mk
index 94638f1..e667320 100644
--- a/vendorsetup.sh
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2014 The Android Open Source Project
+# Copyright (C) 2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
-add_lunch_combo lineage_satsuki-userdebug
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/lineage_satsuki.mk
+
+COMMON_LUNCH_CHOICES := \
+    lineage_satsuki-user \
+    lineage_satsuki-userdebug \
+    lineage_satsuki-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6f083bc..aced7e4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -48,6 +48,9 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 # Radio
 BOARD_HAVE_RADIO := true
 
+# Security Patch Level
+VENDOR_SECURITY_PATCH := 2017-09-01
+
 # Wifi
 WIFI_BUS := PCIE
 
diff --git a/README.md b/README.md
index ed99345..3e997d4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Copyright 2016 - The CyanogenMod Project
 Copyright 2017 - The LineageOS Project
 
-Device configuration for Sony Xperia Z5 Premium
+Device configuration for Sony Xperia Z5
 =====================================
 
 Basic   | Spec Sheet
@@ -13,12 +13,12 @@ Memory  | 3 GB
 Shipped Android Version | 5.1.1
 Storage | 32 GB
 MicroSD | Up to 256 GB (dedicated)
-Battery | 3430 mAh (non-removable)
-Dimensions | 154.4 x 75.8 x 7.8 mm
-Display | 2160 x 3840 pixels, 5.5" IPS LCD
-Weight  | 180 g
+Battery | 2900 mAh (non-removable)
+Dimensions | 146 x 72 x 7.3 mm
+Display | 1080 x 1920 pixels, 5.2" IPS LCD
+Weight  | 154 g
 Rear Camera  | 23 MP, LED flash
 Front Camera | 5.1 MP
-Release Date | November 2015
+Release Date | October 2015
 
-![Sony Xperia Z5 Premium](http://cdn2.gsmarena.com/vv/pics/sony/sony-z5-premium1.jpg "Sony Xperia Z5 Premium")
+![Sony Xperia Z5](http://cdn2.gsmarena.com/vv/pics/sony/sony-z5-4.jpg "Sony Xperia Z5")
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index f458a0e..0f8ff64 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -1515,7 +1515,7 @@
 
     <!-- Gain offset target for dmic1 unit calibration -->
     <path name="dmic1-adj-gain">
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
     </path>
 
     <!-- Gain offset target for dmic2 unit calibration -->
@@ -1889,25 +1889,25 @@
 
     <path name="stereo-mic">
         <path name="stereo-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
         <ctl name="DEC9 Volume" value="84" />
     </path>
 
     <path name="stereo-mic-gain-low">
         <path name="stereo-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
         <ctl name="DEC9 Volume" value="84" />
     </path>
 
     <path name="stereo-mic-gain-mid">
         <path name="stereo-mic-common" />
-        <ctl name="DEC7 Volume" value="98" />
+        <ctl name="DEC7 Volume" value="97" />
         <ctl name="DEC9 Volume" value="97" />
     </path>
 
     <path name="stereo-mic-gain-high">
         <path name="stereo-mic-common" />
-        <ctl name="DEC7 Volume" value="107" />
+        <ctl name="DEC7 Volume" value="106" />
         <ctl name="DEC9 Volume" value="106" />
     </path>
 
@@ -1917,22 +1917,22 @@
 
     <path name="speaker-mono-mic">
         <path name="speaker-mono-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
     </path>
 
     <path name="speaker-mono-mic-gain-low">
         <path name="speaker-mono-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
     </path>
 
     <path name="speaker-mono-mic-gain-mid">
         <path name="speaker-mono-mic-common" />
-        <ctl name="DEC7 Volume" value="90" />
+        <ctl name="DEC7 Volume" value="89" />
     </path>
 
     <path name="speaker-mono-mic-gain-high">
         <path name="speaker-mono-mic-common" />
-        <ctl name="DEC7 Volume" value="96" />
+        <ctl name="DEC7 Volume" value="95" />
     </path>
 
     <path name="speaker-mic-liquid">
@@ -2500,25 +2500,25 @@
 
     <path name="camcorder-mic">
         <path name="camcorder-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
         <ctl name="DEC9 Volume" value="84" />
     </path>
 
     <path name="camcorder-mic-gain-low">
         <path name="camcorder-mic-common" />
-        <ctl name="DEC7 Volume" value="85" />
+        <ctl name="DEC7 Volume" value="84" />
         <ctl name="DEC9 Volume" value="84" />
     </path>
 
     <path name="camcorder-mic-gain-mid">
         <path name="camcorder-mic-common" />
-        <ctl name="DEC7 Volume" value="98" />
+        <ctl name="DEC7 Volume" value="97" />
         <ctl name="DEC9 Volume" value="97" />
     </path>
 
     <path name="camcorder-mic-gain-high">
         <path name="camcorder-mic-common" />
-        <ctl name="DEC7 Volume" value="107" />
+        <ctl name="DEC7 Volume" value="106" />
         <ctl name="DEC9 Volume" value="106" />
     </path>
 
diff --git a/configs/dsi_config.xml b/configs/dsi_config.xml
index bb5f70b..77d3cb9 100644
--- a/configs/dsi_config.xml
+++ b/configs/dsi_config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
      DSI Module configuration XML file
      Copyright (c) 2013, 2015 Qualcomm Technologies, Inc.  All Rights Reserved.
diff --git a/configs/libnfc-brcm.conf b/configs/libnfc-nci.conf
similarity index 83%
rename from configs/libnfc-brcm.conf
rename to configs/libnfc-nci.conf
index ebbea29..eb6746f 100644
--- a/configs/libnfc-brcm.conf
+++ b/configs/libnfc-nci.conf
@@ -1,9 +1,8 @@
-## this file is used by Broadcom's Hardware Abstraction Layer at external/libnfc-nci/halimpl/
+###################### Start of libnfc-brcm.conf #######################
 
 ###############################################################################
 # Application options
-APPL_TRACE_LEVEL=0xFF
-PROTOCOL_TRACE_LEVEL=0xFFFFFFFF
+NFC_DEBUG_ENABLED=0
 
 ###############################################################################
 # performance measurement
@@ -34,7 +33,7 @@ NFA_STORAGE="/data/nfc"
 
 ###############################################################################
 # Insert a delay in milliseconds after NFC_WAKE and before write to NFCC
-NFC_WAKE_DELAY=20
+#NFC_WAKE_DELAY=20
 
 ###############################################################################
 # Various Delay settings (in ms) used in USERIAL
@@ -49,6 +48,11 @@ NFC_WAKE_DELAY=20
 #PRE_POWER_OFF_DELAY=0
 #POST_POWER_OFF_DELAY=0
 
+###############################################################################
+# Maximum time (ms) to wait for RESET NTF after setting REG_PU to high
+# The default is 1000.
+#NFCC_ENABLE_TIMEOUT=0
+
 ###############################################################################
 # LPTD mode configuration
 #  byte[0] is the length of the remaining bytes in this value
@@ -60,7 +64,7 @@ NFC_WAKE_DELAY=20
 #  byte[4-n] are the LPTD parameters.
 #  By default, LPTD is enabled and default settings are used.
 #  See nfc_hal_dm_cfg.c for defaults
-LPTD_CFG={23:B9:21:01:02:FF:FF:04:A0:0F:40:00:80:02:02:10:00:00:00:31:0C:30:00:00:00:00:00:00:00:00:00:00:00:00:00:00}
+#LPTD_CFG={23:B9:21:01:02:FF:FF:04:A0:0F:40:00:80:02:02:10:00:00:00:31:0C:30:00:00:00:00:00:00:00:00:00:00:00:00:00:00}
 
 ###############################################################################
 # Startup Configuration (100 bytes maximum)
@@ -72,7 +76,7 @@ LPTD_CFG={23:B9:21:01:02:FF:FF:04:A0:0F:40:00:80:02:02:10:00:00:00:31:0C:30:00:0
 #   3 : UICCx supports both ISO_DEP and Mifare in low power mode.
 #
 #                                                                          AA BB
-NFA_DM_START_UP_CFG={1F:CB:01:01:A5:01:01:CA:14:00:00:00:00:06:E8:03:00:00:00:00:00:00:00:00:00:00:00:00:00:80:01:01}
+#NFA_DM_START_UP_CFG={1F:CB:01:01:A5:01:01:CA:14:00:00:00:00:06:E8:03:00:00:00:00:00:00:00:00:00:00:00:00:00:80:01:01}
 
 ###############################################################################
 # Startup Vendor Specific Configuration (100 bytes maximum);
@@ -84,11 +88,6 @@ NFA_DM_START_UP_CFG={1F:CB:01:01:A5:01:01:CA:14:00:00:00:00:06:E8:03:00:00:00:00
 #  byte[5] 0=turn off SWP frame logging; 1=turn on
 #  NFA_DM_START_UP_VSC_CFG={05:2F:09:02:01:01}
 
-###############################################################################
-# Total Duration Configuration (msec)
-# Min=0x0000 Max=0xFFFF(65535)
-NFA_DM_DISC_DURATION_POLL=300
-
 ###############################################################################
 # Antenna Configuration - This data is used when setting 0xC8 config item
 # at startup (before discovery is started).  If not used, no value is sent.
@@ -119,6 +118,11 @@ NFA_HCI_DEFAULT_DEST_GATE=0xF0
 # one of them (e.g. 0xF4).
 #ACTIVE_SE=0xF3
 
+###############################################################################
+# Configure the default NfcA/IsoDep techology and protocol route. Can be
+# either a secure element (e.g. 0xF4) or the host (0x00)
+#DEFAULT_ISODEP_ROUTE=0x00
+
 ###############################################################################
 # Configure the NFC Extras to open and use a static pipe.  If the value is
 # not set or set to 0, then the default is use a dynamic pipe based on a
@@ -132,7 +136,7 @@ NFA_HCI_STATIC_PIPE_ID_C0=0x19
 # the secure element to deselect the applet.
 # The default hex value of the command is 0x3.  If this variable is undefined,
 # then this feature is not used.
-OBERTHUR_WARM_RESET_COMMAND=0x03
+#OBERTHUR_WARM_RESET_COMMAND=0x03
 
 ###############################################################################
 # Force UICC to only listen to the following technology(s).
@@ -141,12 +145,10 @@ OBERTHUR_WARM_RESET_COMMAND=0x03
 UICC_LISTEN_TECH_MASK=0x07
 
 ###############################################################################
-# Forcing HOST to listen for a selected technology
-# 0x00 : Disable Host Listen
-# 0x01 : Enable Host Listen for Tech A
-# 0x02 : Enable Host Listen for Tech B
-# 0x03 : Enable Host Listen for Tech AB
-HOST_LISTEN_TECH_MASK=0x03
+# Force HOST listen feature enable or disable.
+# 0: Disable
+# 1: Enable
+HOST_LISTEN_ENABLE=0x01
 
 ###############################################################################
 # Enabling/Disabling Forward functionality
@@ -165,12 +167,6 @@ UICC_IDLE_TIMEOUT=0
 # If specified, this AID will be substituted when an Empty SELECT command is
 # detected.  The first byte is the length of the AID.  Maximum length is 16.
 AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-###############################################################################
-# Maximum Number of Credits to be allowed by the NFCC
-#   This value overrides what the NFCC specifices allowing the host to have
-#   the control to work-around transport limitations.  If this value does
-#   not exist or is set to 0, the NFCC will provide the number of credits.
-MAX_RF_DATA_CREDITS=1
 
 ###############################################################################
 # This setting allows you to disable registering the T4t Virtual SE that causes
@@ -188,12 +184,12 @@ SCREEN_OFF_POWER_STATE=1
 ###############################################################################
 # Firmware patch file
 #  If the value is not set then patch download is disabled.
-FW_PATCH="/vendor/firmware/bcm2079x_firmware.ncd"
+#FW_PATCH="/vendor/firmware/bcm2079x_firmware.ncd"
 
 ###############################################################################
 # Firmware pre-patch file (sent before the above patch file)
 #  If the value is not set then pre-patch is not used.
-FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
+#FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
 
 ###############################################################################
 # Firmware patch format
@@ -223,7 +219,7 @@ FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
 #    "hwtun"            (HW Tunnel)
 #    "/dev/bcmspinfc"   (SPI)
 #    "/dev/btusb0"      (BT USB)
-TRANSPORT_DRIVER="/dev/bcm2079x"
+#TRANSPORT_DRIVER="/dev/bcm2079x-i2c"
 
 ###############################################################################
 # power control driver
@@ -236,12 +232,13 @@ TRANSPORT_DRIVER="/dev/bcm2079x"
 #    "/dev/bcmi2cnfc"   (I2C)
 #    "/dev/bcmspinfc"   (SPI)
 #    i2c and spi driver may be used to control NFC_EN and NFC_WAKE signal
-POWER_CONTROL_DRIVER="/dev/bcm2079x"
+#POWER_CONTROL_DRIVER="/dev/bcm2079x-i2c"
 
 ###############################################################################
 # I2C transport driver options
-#
-BCMI2CNFC_ADDRESS=0
+# Mako does not support 10-bit I2C addresses
+# Revert to 7-bit address
+#BCMI2CNFC_ADDRESS=0x77
 
 ###############################################################################
 # I2C transport driver try to read multiple packets in read() if data is available
@@ -273,7 +270,7 @@ BCMI2CNFC_ADDRESS=0
 # writing next block of data.  the delay is calculated as below
 #   NFC_WRITE_DELAY * (number of byte written) / 1000 milliseconds
 # e.g. after 259 bytes is written, delay (259 * 20 / 1000) 5 ms before next write
-NFC_WRITE_DELAY=20
+#NFC_WRITE_DELAY=20
 
 ###############################################################################
 # Maximum Number of Credits to be allowed by the NFCC
@@ -283,20 +280,18 @@ NFC_WRITE_DELAY=20
 MAX_RF_DATA_CREDITS=1
 
 ###############################################################################
-# Antenna Configuration - This data is used when setting 0xC8 config item
-# at startup (before discovery is started).  If not used, no value is sent.
-#
-# The settings for this value are documented here:
-# http://wcgbu.broadcom.com/wpan/PM/Project%20Document%20Library/bcm20791B0/
-#   Design/Doc/PHY%20register%20settings/BCM20791-B2-1027-02_PHY_Recommended_Reg_Settings.xlsx
-# This document is maintained by Paul Forshaw.
-#
-# The values marked as ?? should be tweaked per antenna or customer/app:
-# {20:C8:1E:06:??:00:??:??:??:00:??:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:??:01:00:00:40:04}
-# array[0] = 0x20 is length of the payload from array[1] to the end
-# array[1] = 0xC8 is PREINIT_DSP_CFG
-#PREINIT_DSP_CFG={20:C8:1E:06:1F:00:0F:03:3C:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:48:01:00:00:40:04}
+# Default poll duration (in ms)
+#  The defualt is 500ms if not set (see nfc_target.h)
+#NFA_DM_DISC_DURATION_POLL=333
 
+###############################################################################
+# Choose the presence-check algorithm for type-4 tag.  If not defined, the default value is 1.
+# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
+# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
+# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
+# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
+# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
+#PRESENCE_CHECK_ALGORITHM=0
 
 ###############################################################################
 # Force tag polling for the following technology(s).
@@ -332,6 +327,11 @@ P2P_LISTEN_TECH_MASK=0xC5
 PRESERVE_STORAGE=0x01
 
 ###############################################################################
+# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
+# The value is set to 3 by default as it assumes we will discover 0xF2,
+# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
+# so that the stack will not wait any longer than necessary.
+
 # Maximum EE supported number
 # NXP PN547C2 0x02
 # NXP PN65T 0x03
@@ -343,6 +343,11 @@ NFA_MAX_EE_SUPPORTED=0x02
 # NCI Hal Module name
 NCI_HAL_MODULE="nfc_nci"
 
+##############################################################################
+# Deactivate notification wait time out in seconds used in ETSI Reader mode
+# 0 - Infinite wait
+NFA_DM_DISC_NTF_TIMEOUT=100
+
 ###############################################################################
 # AID_MATCHING constants
 # AID_MATCHING_EXACT_ONLY 0x00
@@ -354,4 +359,19 @@ AID_MATCHING_MODE=0x01
 # Preferred Secure Element for Technology based routing
 # eSE               0x01
 # UICC              0x02
+
 NXP_PRFD_TECH_SE=0x02
+
+###############################################################################
+# Vendor Specific Proprietary Protocol & Discovery Configuration
+# Set to 0xFF if unsupported
+#  byte[0] NCI_PROTOCOL_18092_ACTIVE
+#  byte[1] NCI_PROTOCOL_B_PRIME
+#  byte[2] NCI_PROTOCOL_DUAL
+#  byte[3] NCI_PROTOCOL_15693
+#  byte[4] NCI_PROTOCOL_KOVIO
+#  byte[5] NCI_PROTOCOL_MIFARE
+#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
+#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
+#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
+NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:77:FF:FF}
\ No newline at end of file
diff --git a/configs/libnfc-nxp.conf b/configs/libnfc-nxp.conf
index e47b067..d024343 100644
--- a/configs/libnfc-nxp.conf
+++ b/configs/libnfc-nxp.conf
@@ -17,14 +17,6 @@ NXPLOG_NCIR_LOGLEVEL=0x01
 NXPLOG_FWDNLD_LOGLEVEL=0x01
 NXPLOG_TML_LOGLEVEL=0x01
 
-###############################################################################
-# Nfc Device Node name
-NXP_NFC_DEV_NODE="/dev/pn544"
-
-###############################################################################
-# File name for Firmware
-NXP_FW_NAME="libpn547_fw.so"
-
 ###############################################################################
 # Extension for Mifare reader enable
 #    0x00 - Disabled
@@ -213,16 +205,16 @@ NXP_CORE_SCRN_OFF_AUTONOMOUS_ENABLE=0x00
 # *** ALM(NO BOOSTER) FW VERSION = 08.01.25 ***
 NXP_RF_CONF_BLK_1={
     20, 02, F3, 20,
-    A0, 0D, 03, 00, 40, 0A,
+    A0, 0D, 03, 00, 40, 04,
     A0, 0D, 03, 04, 43, 20,
     A0, 0D, 03, 04, FF, 05,
     A0, 0D, 06, 06, 44, A3, 90, 03, 00,
     A0, 0D, 06, 06, 30, CF, 00, 08, 00,
     A0, 0D, 06, 06, 2F, 8F, 05, 80, 0C,
-    A0, 0D, 04, 06, 03, 00, 6E,
-    A0, 0D, 03, 06, 48, 18,
+    A0, 0D, 04, 06, 03, 00, 71,
+    A0, 0D, 03, 06, 48, 1F,
     A0, 0D, 03, 06, 43, A0,
-    A0, 0D, 06, 06, 42, 00, 02, F3, F1,
+    A0, 0D, 06, 06, 42, 00, 02, FF, F1,
     A0, 0D, 06, 06, 41, 80, 00, 00, 00,
     A0, 0D, 03, 06, 37, 18,
     A0, 0D, 03, 06, 16, 00,
@@ -244,7 +236,7 @@ NXP_RF_CONF_BLK_1={
     A0, 0D, 06, 32, 4A, 30, 07, 01, 1F,
     A0, 0D, 06, 34, 2D, 24, 77, 0C, 00,
     A0, 0D, 06, 34, 34, 00, 00, E4, 03,
-    A0, 0D, 06, 34, 44, 20, 00, 02, 00
+    A0, 0D, 06, 34, 44, 2D, 00, 02, 00
 }
 # *** ALM(NO BOOSTER) FW VERSION = 08.01.25 ***
 NXP_RF_CONF_BLK_2={
@@ -270,7 +262,7 @@ NXP_RF_CONF_BLK_2={
     A0, 0D, 06, 46, 44, 21, 00, 02, 00,
     A0, 0D, 06, 46, 2D, 05, 47, 0E, 00,
     A0, 0D, 06, 44, 4A, 33, 07, 01, 07,
-    A0, 0D, 06, 44, 42, 70, 10, FF, FF,
+    A0, 0D, 06, 44, 42, 88, 10, FF, FF,
     A0, 0D, 03, 44, 16, 00,
     A0, 0D, 03, 44, 15, 00,
     A0, 0D, 06, 4A, 44, 22, 00, 02, 00,
@@ -299,16 +291,16 @@ NXP_RF_CONF_BLK_3={
     A0, 0D, 06, 56, 44, 22, 00, 02, 00,
     A0, 0D, 06, 5C, 2D, 05, 69, 0C, 00,
     A0, 0D, 06, 5C, 44, 21, 00, 02, 00,
-    A0, 0D, 06, 54, 42, 70, 10, FF, FF,
+    A0, 0D, 06, 54, 42, 88, 10, FF, FF,
     A0, 0D, 06, 54, 4A, 33, 07, 01, 07,
     A0, 0D, 03, 54, 16, 00,
     A0, 0D, 03, 54, 15, 00,
-    A0, 0D, 06, 5A, 42, 70, 10, FF, FF,
+    A0, 0D, 06, 5A, 42, 90, 10, FF, FF,
     A0, 0D, 06, 5A, 4A, 31, 07, 01, 07,
     A0, 0D, 03, 5A, 16, 00,
     A0, 0D, 03, 5A, 15, 00,
     A0, 0D, 06, 98, 2F, AF, 05, 80, 0F,
-    A0, 0D, 06, 9A, 42, 00, 03, F2, F1,
+    A0, 0D, 06, 9A, 42, 00, 02, FF, F1,
     A0, 0D, 06, 30, 44, A3, 90, 03, 00,
     A0, 0D, 06, 6C, 44, A3, 90, 03, 00,
     A0, 0D, 06, 6C, 30, CF, 00, 08, 00,
@@ -337,7 +329,7 @@ NXP_RF_CONF_BLK_4={
     A0, 0D, 06, 88, 30, 5F, 00, 16, 00,
     A0, 0D, 03, 88, 47, 00,
     A0, 0D, 06, 88, 44, A1, 90, 03, 00,
-    A0, 0D, 03, 0C, 48, 18,
+    A0, 0D, 03, 0C, 48, 1F,
     A0, 0D, 03, 10, 43, 20,
     A0, 0D, 06, 6A, 42, F8, 10, FF, FF,
     A0, 0D, 03, 6A, 16, 00,
@@ -364,12 +356,6 @@ NXP_RF_CONF_BLK_5={
 NXP_RF_CONF_BLK_6={
 }
 
-##############################################################################
-# Set configuration optimization decision setting
-# Enable    = 0x01
-# Disable   = 0x00
-NXP_SET_CONFIG_ALWAYS=0x01
-
 ###############################################################################
 # Core configuration extensions
 # It includes
@@ -414,11 +400,11 @@ NXP_CORE_CONF_EXTN={20, 02, 4D, 12,
         A0, 0E, 01, 01,
         A0, 11, 04, CD, 67, 22, 01,
         A0, 12, 01, 00,
-        A0, 13, 01, 02,
+        A0, 13, 01, 00,
         A0, 40, 01, 01,
-        A0, 41, 01, 04,
+        A0, 41, 01, 02,
         A0, 42, 01, 19,
-        A0, 43, 01, 05,
+        A0, 43, 01, 50,
         A0, 47, 02, 88, 43,
         A0, 5E, 01, 01,
         A0, 61, 01, 2A,
@@ -547,28 +533,4 @@ NXP_CE_ROUTE_STRICT_DISABLE=0x01
 # AID_MATCHING_L 0x01
 # AID_MATCHING_K 0x02
 AID_MATCHING_PLATFORM=0x01
-################################################################################
-#Used to Restrict Type A UICC baud rate
-#0 = default supported
-#1 = 212 maximum supported
-#2 = 424 maximum supported
-#3 = 848 maximum supported
-
-NXP_TYPEA_UICC_BAUD_RATE=0x00
-################################################################################
-#Used to Restrict Type B UICC baud rate
-#0 = default supported
-#1 = 212 maximum supported
-#2 = 424 maximum supported
-#3 = 848 maximum supported
-
-NXP_TYPEB_UICC_BAUD_RATE=0x00
-################################################################################
-
-#Config to allow adding aids
-#NFC on/off is required after this config
-#1 = enabling adding aid  to NFCC routing table.
-#0 = disabling adding aid to NFCC routing table.
-NXP_ENABLE_ADD_AID=0x01
-##################################################################################
 
diff --git a/configs/netmgr_config.xml b/configs/netmgr_config.xml
index a87f619..b9fe1f7 100644
--- a/configs/netmgr_config.xml
+++ b/configs/netmgr_config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
      Netmgr Module configuration XML file
      Copyright (c) 2013, 2016 Qualcomm Technologies, Inc.  All Rights Reserved.
@@ -771,7 +772,6 @@
       <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
       <data name="pnd_rps_mask" type="int"> 2 </data>
-      <data name="vnd_rps_mask" type="int"> 4 </data>
       <data name="netdev_budget" type="int"> 9 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
diff --git a/configs/qmi_config.xml b/configs/qmi_config.xml
index 311b309..129360c 100644
--- a/configs/qmi_config.xml
+++ b/configs/qmi_config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
      QMI Module configuration XML file
      Copyright (c) 2013-2015 Qualcomm Technologies, Inc.  All Rights Reserved.
diff --git a/configs/sec_config b/configs/sec_config
index c7fe784..61eb95d 100644
--- a/configs/sec_config
+++ b/configs/sec_config
@@ -1,12 +1,16 @@
 /* IPC Security Config */
 /* <GPS QMI Service ID - 16>:<GPS QMI Instance ID - all instances>:<Client Group ID> */
 16:4294967295:1000:1021
+/* <LOWI QMI Service ID - 38>:<LOWI QMI Instance ID - all instances>:<Client Group ID> */
+56:4294967295:1021:3004
 /* Allow SS CTL service to be used by system and net_raw processes */
 43:4294967295:1000:3004
 /* <UIMHTTP QMI Service ID - 16>:<UIMHTTP QMI Instance ID - all instances>:<Client Group ID> */
 71:4294967295:1001
 /* <UIMRMT QMI Service ID - 16>:<UIMRMT QMI Instance ID - all instances>:<Client Group ID> */
 50:4294967295:1001
+/* QMI-SLIM service permitted to gps and net_raw */
+55:4294967295:1021:3004
 /* Allow Sensor services to be used by sensor process */
 256:4294967295:1000:1006:1013:1021:1047
 257:4294967295:1000:1006:1013:1021:1047
@@ -274,8 +278,9 @@
 9:4294967295:1001:3004
 1:4294967295:1001:3004:1000
 4:4294967295:1001:3004
-2797:4294967295:1001:3004
-2808:4294967295:1001:3004:1000
+7:4294967295:1001:3004
+8:4294967295:1001:3004:1000
+68:4294967295:1001:3004
 /* DPM */
 47:4294967295:1001:3004
 /* Allow communication to some QMI services with radio privilages */
@@ -305,13 +310,13 @@
 /* SERVREG_NOTIF */
 64:4294967295:1001
 66:4294967295:1001
-/* LTE */
+/*LTE*/
 70:4294967295:1001
 /* Allow Data dpmd to access QMI DFS */
 48:4294967295:1000:3004
 /* DIAG */
-4097:4294967295:2002:2950:3009
+4097:4294967295:2002:2950:3009:2901
 /* <WLPS QMI Service ID - 0x39>:<WLFW QMI Instance ID - all instances>:<Client Group ID> */
 57:4294967295:1000
-/* <WLFW QMI Service ID - 0x45>:<WLFW QMI Instance ID - all instances>:<Client Group ID> */
-69:4294967295:1000
+/* COEX */
+34:4294967295:1001
diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
index 39878a7..a23a20a 100644
--- a/configs/thermal-engine.conf
+++ b/configs/thermal-engine.conf
@@ -1,94 +1,113 @@
-[msm_therm.DEFAULT]
+[emmc_therm__0.DEFAULT]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds 43000 45000 45500 47000 49000 50500 51500 52500 53000 53300 54000 54500 55500 56000 60200
-thresholds_clr 41000 43000 43500 45000 47000 49500 50500 51500 52000 52300 53000 53500 54500 55000 56000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1555200+1958400+0+0+1+1+630000000+209+2+0+100000+0 1555200+1958400+0+0+1+1+630000000+171+3+0+100000+0 1555200+1958400+0+0+1+1+630000000+171+5+0+100000+0 1555200+1248000+0+0+1+1+630000000+141+5+0+100000+0 1478400+864000+0+1+1+1+630000000+141+8+0+001800+0 1344000+384000+1+1+1+1+630000000+115+8+0+001800+0 1248000+384000+1+1+1+1+630000000+95+8+0+001800+0 1248000+384000+1+1+1+1+450000000+78+8+0+001800+0 960000+384000+1+1+1+1+450000000+78+9+1+001800+0 864000+384000+1+1+1+1+390000000+64+11+1+001800+5 768000+384000+1+1+1+1+390000000+64+12+1+001800+5 600000+384000+1+1+1+1+180000000+51+12+1+001800+5 460800+384000+1+1+1+1+180000000+44+12+1+001800+5 384000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
+thresholds 43000 47700 48900 50200 51400 52000 52600 53200 53600 54000 54500 55000 55500 55900 56300 56800
+thresholds_clr 40000 43000 47700 48900 50200 51400 52000 52600 53200 53600 54000 54500 55000 55500 55900 56300
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 1555200+1958400+0+0+1+1+630000000+255+2+0+100000+0+0 1555200+1248000+0+0+1+1+630000000+209+3+0+100000+0+0 1478400+864000+0+1+1+1+630000000+171+3+0+100000+0+0 1478400+384000+1+1+1+1+630000000+141+3+0+100000+0+0 1344000+384000+1+1+1+1+630000000+115+3+0+100000+0+0 1344000+384000+1+1+1+1+630000000+95+3+0+100000+0+0 1248000+384000+1+1+1+1+630000000+78+8+0+100000+0+0 1248000+384000+1+1+1+1+630000000+64+8+0+001800+0+0 960000+384000+1+1+1+1+630000000+52+9+0+001800+0+0 960000+384000+1+1+1+1+450000000+44+12+0+001800+0+0 864000+384000+1+1+1+1+450000000+44+12+0+001800+0+0 864000+384000+1+1+1+1+390000000+44+12+1+001800+0+0 768000+384000+1+1+1+1+390000000+44+12+1+001800+0+0 600000+384000+1+1+1+1+180000000+44+12+1+001800+0+0 460800+384000+1+1+1+1+180000000+44+12+1+001800+0+0 384000+384000+1+1+1+1+180000000+44+12+1+001800+5+0
 
-[msm_therm.CAMERA-Step]
+[emmc_therm__1.DEFAULT]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds -100000 45500 47000 49000 52000 53500 56000 60200
-thresholds_clr -110000 40000 45500 47000 49000 52000 53500 56000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1555200+1958400+0+0+0+0+630000000+141+8+0+100000+0 1555200+1728000+0+0+1+1+630000000+95+9+0+100000+0 1555200+1248000+0+1+1+1+305000000+78+12+0+100000+0 960000+384000+1+1+1+1+305000000+51+12+1+001800+0 960000+384000+1+1+1+1+305000000+51+12+1+001800+1 960000+384000+1+1+1+1+305000000+44+12+1+001800+5 960000+384000+1+1+1+1+305000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
+thresholds 58000 63000
+thresholds_clr 56800 59000
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 384000+384000+1+1+1+1+180000000+44+12+1+001800+6+0 384000+384000+1+1+1+1+180000000+36+13+1+001800+6+1
+
+[emmc_therm__0.CAMERA-Step]
+algo_type monitor
+sensor emmc_therm
+sampling 1000
+thresholds -100000 42700 45000 48000 51000 52400 55000 57000 63000
+thresholds_clr -110000 40000 42700 45000 48000 51000 52400 55000 57000
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 1555200+1958400+0+0+0+0+630000000+141+8+0+100000+0+0 960000+960000+0+1+1+1+630000000+95+8+0+100000+0+0 960000+384000+1+1+1+1+630000000+44+8+0+100000+0+0 960000+384000+1+1+1+1+305000000+44+9+0+100000+0+0 960000+384000+1+1+1+1+305000000+44+12+0+001800+0+0 960000+384000+1+1+1+1+305000000+44+12+0+001800+1+0 960000+384000+1+1+1+1+305000000+44+12+1+001800+5+0 960000+384000+1+1+1+1+305000000+44+12+1+001800+6+1 384000+384000+1+1+1+1+180000000+36+13+1+001800+6+1
 disable
 
-[msm_therm.CAMERA-Low]
+[emmc_therm__0.CAMERA-Low]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 672000+384000+1+1+1+1+180000000+141+8+0+100000+0 672000+384000+1+1+1+1+180000000+95+9+0+100000+0 672000+384000+1+1+1+1+180000000+78+12+0+100000+0 672000+384000+1+1+1+1+180000000+51+12+1+001800+0 672000+384000+1+1+1+1+180000000+44+12+1+001800+5 672000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
+thresholds -100000 40000 49000 51000 55000 58000 63000
+thresholds_clr -110000 38000 40000 49000 51000 55000 58000
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 672000+384000+1+1+1+1+180000000+141+8+0+100000+0+0 600000+384000+1+1+1+1+180000000+95+8+0+100000+0+0 600000+384000+1+1+1+1+180000000+78+9+0+100000+0+0 600000+384000+1+1+1+1+180000000+44+12+0+001800+0+0 600000+384000+1+1+1+1+180000000+44+12+1+001800+5+0 600000+384000+1+1+1+1+180000000+44+12+1+001800+6+1 384000+384000+1+1+1+1+180000000+36+13+1+001800+6+1
 disable
 
-[msm_therm.CAMERA-Mid]
+[emmc_therm__0.CAMERA-Mid]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 960000+384000+1+1+1+1+180000000+141+8+0+100000+0 960000+384000+1+1+1+1+180000000+95+9+0+100000+0 960000+384000+1+1+1+1+180000000+78+12+0+100000+0 960000+384000+1+1+1+1+180000000+51+12+1+001800+0 960000+384000+1+1+1+1+180000000+44+12+1+001800+5 960000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
+thresholds -100000 47700 50000 53000 56000 58800 63000
+thresholds_clr -110000 40000 47700 50000 53000 56000 58800
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 960000+384000+1+1+1+1+180000000+141+8+0+100000+0+0 960000+384000+1+1+1+1+180000000+95+8+0+100000+0+0 960000+384000+1+1+1+1+180000000+78+9+0+100000+0+0 960000+384000+1+1+1+1+180000000+44+12+0+001800+0+0 960000+384000+1+1+1+1+180000000+44+12+1+001800+5+0 960000+384000+1+1+1+1+180000000+44+12+1+001800+6+1 384000+384000+1+1+1+1+180000000+36+13+1+001800+6+1
 disable
 
-[msm_therm.CAMERA-Hi]
+[emmc_therm__0.CAMERA-Hi]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1344000+384000+1+1+1+1+305000000+141+8+0+100000+0 1344000+384000+1+1+1+1+305000000+95+9+0+100000+0 1344000+384000+1+1+1+1+305000000+78+12+0+100000+0 1344000+384000+1+1+1+1+305000000+51+12+1+001800+0 1344000+384000+1+1+1+1+305000000+44+12+1+001800+5 1344000+384000+1+1+1+1+305000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
+thresholds -100000 47700 50000 53000 56000 58800 63000
+thresholds_clr -110000 40000 47700 50000 53000 56000 58800
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 1344000+384000+1+1+1+1+305000000+141+8+0+100000+0+0 1344000+384000+1+1+1+1+305000000+95+8+0+100000+0+0 1344000+384000+1+1+1+1+305000000+78+9+0+100000+0+0 1344000+384000+1+1+1+1+305000000+44+12+0+000600+0+0 1344000+384000+1+1+1+1+305000000+44+12+1+000600+5+0 1344000+384000+1+1+1+1+305000000+44+12+1+000600+6+1 384000+384000+1+1+1+1+180000000+36+13+1+000600+6+1
 disable
 
-[msm_therm.CAMERA-All]
+[emmc_therm__0.CAMERA-4k]
 algo_type monitor
-sensor msm_therm
+sensor emmc_therm
 sampling 1000
-thresholds -100000 45500 47000 49000
-thresholds_clr -110000 40000 45500 47000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem
-action_info 1555200+1958400+0+0+0+0+630000000+141+8+0 1555200+1728000+0+0+1+1+630000000+95+9+0 1555200+1248000+0+1+1+1+305000000+78+12+0 1344000+384000+1+1+1+1+305000000+51+12+1
+thresholds -100000 47700 50000 53000 56000 58800 63000
+thresholds_clr -110000 40000 47700 50000 53000 56000 58800
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam+s_tel
+action_info 1344000+384000+1+1+1+1+305000000+141+8+0+100000+0+0 1344000+384000+1+1+1+1+305000000+95+8+0+100000+0+0 1344000+384000+1+1+1+1+305000000+78+9+0+100000+0+0 1344000+384000+1+1+1+1+305000000+44+12+0+001800+0+0 1344000+384000+1+1+1+1+305000000+44+12+1+001800+5+0 1344000+384000+1+1+1+1+305000000+44+12+1+001800+6+1 384000+384000+1+1+1+1+180000000+36+13+1+001800+6+1
 disable
 
-[batt_therm]
+[emmc_therm__0.CAMERA-ALL]
 algo_type monitor
-sensor bms
+sensor emmc_therm
 sampling 1000
-thresholds -100000 43000 44000 67000
-thresholds_clr -110000 41000 42000 0
-actions battery battery battery battery+s_shutdown
-action_info 1 2 3 13+5
+thresholds 47700 50000 53000
+thresholds_clr 40000 47700 50000
+actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery
+action_info 1555200+1728000+0+0+0+1+630000000+95+8 1555200+1248000+0+1+1+1+305000000+78+9 1344000+384000+1+1+1+1+305000000+44+12
+disable
 
-[msm_therm]
+[sony_camera]
 algo_type monitor
-sensor msm_therm
+sensor sony_camera_0
 sampling 1000
-thresholds 54000 60200 62000 74000
-thresholds_clr 50000 59000 60200 0
-actions s_tether+s_tel+s_bg s_tether+s_tel+s_bg s_tether+s_tel+s_bg s_tether+s_tel+s_bg+s_shutdown
-action_info 0+0+1 1+1+1 1+1+1 1+1+1+5
+thresholds 61000 63000 65000 67000
+thresholds_clr 58000 61000 63000 0
+actions s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam+s_shutdown
+action_info 001800+1 001800+5 001800+6 001800+6+5
 
-[bl_therm]
+[Hangout_Fail_Safe]
 algo_type monitor
-sensor quiet_therm
+sensor emmc_therm
 sampling 1000
-thresholds 39000 39500 40000 41000 41500 42000
-thresholds_clr 38000 38500 39000 40000 40500 41000
-actions s_backlight s_backlight s_backlight s_backlight s_backlight s_backlight
-action_info 209 171 141 115 78 44
+thresholds 56000
+thresholds_clr 50000
+actions s_bg
+action_info 1
 
-[sony_camera]
+[batt_therm]
 algo_type monitor
-sensor sony_camera_0
+sensor bms
+sampling 1000
+thresholds 42000 67000
+thresholds_clr 41000 0
+actions battery battery+s_shutdown
+action_info 3 13+5
+
+[emmc_therm]
+algo_type monitor
+sensor emmc_therm
 sampling 1000
-thresholds 55000 59000 60000 62000 67000
-thresholds_clr 49000 53000 57000 60000 61000
-actions s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam+s_shutdown
-action_info 001800+0 001800+1 001800+5 001800+6 001800+6+5
+thresholds 64000 80000
+thresholds_clr 59000 0
+actions s_tether s_tether+s_shutdown
+action_info 1 1+5
diff --git a/configs/wlan/bcmdhd.cal b/configs/wlan/bcmdhd.cal
index ed1ed5e..97b8589 100644
--- a/configs/wlan/bcmdhd.cal
+++ b/configs/wlan/bcmdhd.cal
@@ -71,10 +71,8 @@ temps_hysteresis=15
 tempoffset=255
 rawtempsense=0x1ff
 
-tworangetssi2g=1
+tworangetssi2g=0
 tworangetssi5g=0
-lowpowerrange2g=0
-lowpowerrange5g=0
 
 #pa2gccka0=-145,6220,-699
 #pa2gccka1=-167,5991,-703
@@ -124,6 +122,7 @@ mcsbw805ghpo=0xcaaaaaaa,0x11111111
 mcslr5glpo=0x0000
 mcslr5gmpo=0x0000
 mcslr5ghpo=0x0000
+
 sb20in40hrpo=0x0
 sb20in80and160hr5glpo=0x0
 sb40and80hr5glpo=0x0
diff --git a/device.mk b/device.mk
index 1bf4a75..4b19709 100644
--- a/device.mk
+++ b/device.mk
@@ -21,33 +21,25 @@ $(call inherit-product, device/sony/kitakami-common/device-common.mk)
 # Get non-open-source specific aspects
 $(call inherit-product, vendor/sony/satsuki/satsuki-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS += \
-    $(DEVICE_PATH)/overlay
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+# Screen density
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 3840
 TARGET_SCREEN_WIDTH := 2160
-TARGET_BOOTANIMATION_HALF_RES := true
-
-# Device uses high-density artwork where available
-PRODUCT_AAPT_CONFIG := normal
-PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
-# Init
+# init
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/bin/init.qcom.power.sh:system/bin/init.qcom.power.sh
 
-# Audio
+# Audio configuration
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
 
-# Fingerprint
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
-
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service
-
 # Input
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/idc/clearpad.idc:system/usr/idc/clearpad.idc
@@ -58,8 +50,8 @@ PRODUCT_COPY_FILES += \
 
 # NFC configs
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
-    $(LOCAL_PATH)/configs/libnfc-nxp.conf:system/etc/libnfc-nxp.conf
+    $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
+    $(LOCAL_PATH)/configs/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
 
 # RIL
 PRODUCT_COPY_FILES += \
@@ -74,3 +66,10 @@ PRODUCT_COPY_FILES += \
 # WLAN
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/wlan/bcmdhd.cal:system/etc/firmware/wlan/bcmdhd/bcmdhd.cal
+
+# Fingerprint
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.0-service.kitakami
diff --git a/lineage.mk b/full_satsuki.mk
similarity index 77%
rename from lineage.mk
rename to full_satsuki.mk
index 1dc58e3..e6d8299 100644
--- a/lineage.mk
+++ b/full_satsuki.mk
@@ -1,5 +1,5 @@
+#
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
@@ -20,16 +21,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from satsuki device
 $(call inherit-product, device/sony/satsuki/device.mk)
 
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-PRODUCT_NAME := lineage_satsuki
-PRODUCT_DEVICE := satsuki
-PRODUCT_MANUFACTURER := Sony
+# Set those variables here to overwrite the inherited values.
 PRODUCT_BRAND := Sony
+PRODUCT_NAME := full_satsuki
+PRODUCT_MANUFACTURER := Sony
+PRODUCT_DEVICE := satsuki
 PRODUCT_MODEL := Xperia Z5 Premium
-
-PRODUCT_GMS_CLIENTID_BASE := android-sony
-
-TARGET_VENDOR := Sony
-TARGET_VENDOR_PRODUCT_NAME := satsuki
diff --git a/idc/clearpad.idc b/idc/clearpad.idc
index d5dc5ab..7d88827 100644
--- a/idc/clearpad.idc
+++ b/idc/clearpad.idc
@@ -2,7 +2,7 @@
 touch.deviceType = touchScreen
 
 # Pressure
-touch.pressure.scale = 0.0093
+touch.pressure.scale = 0.0065
 
 # Touch Filter
 touch.filter.level = 3
@@ -17,14 +17,14 @@ touch.filter.tfsw.f0.path = /system/lib64/touchfilter/roadrunner_ukf.so
 # Roadrunner
 touch.filter.RoadRunner.Enabled = 1
 touch.filter.RoadRunner.Debug = 0
-touch.filter.RoadRunner.c0.PredictionSteps = 0.0
-touch.filter.RoadRunner.c1.PredictionSteps = 2.8
-touch.filter.RoadRunner.c2.PredictionSteps = 2.8
-touch.filter.RoadRunner.c3.PredictionSteps = 2.8
-touch.filter.RoadRunner.FrameRate = 0.0111
+touch.filter.RoadRunner.c0.PredictionSteps = 2.1
+touch.filter.RoadRunner.c1.PredictionSteps = 3.2
+touch.filter.RoadRunner.c2.PredictionSteps = 4.9
+touch.filter.RoadRunner.c3.PredictionSteps = 6.4
+touch.filter.RoadRunner.FrameRate = 0.0079
 touch.filter.RoadRunner.PreSmoothingFactor = 0.2
 touch.filter.RoadRunner.PostSmoothingFactor = 0.1
-touch.filter.RoadRunner.DisplayPpi = 403
+touch.filter.RoadRunner.DisplayPpi = 428
 touch.filter.RoadRunner.VelocityThreshold = 50
 touch.filter.RoadRunner.OvershootControl = 1
 
diff --git a/init_satsuki/Android.bp b/init_satsuki/Android.bp
new file mode 100644
index 0000000..a5785c5
--- /dev/null
+++ b/init_satsuki/Android.bp
@@ -0,0 +1,27 @@
+//
+// Copyright (C) 2019 The LineageOS Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library_static {
+    name: "libinit_satsuki",
+    recovery_available: true,
+    srcs: ["init_satsuki.cpp"],
+    include_dirs: [
+        "system/core/base/include",
+        "system/core/init",
+        "external/selinux/libselinux/include",
+        "external/libcap/libcap/include"
+    ]
+}
diff --git a/init/init_satsuki.cpp b/init_satsuki/init_satsuki.cpp
similarity index 65%
rename from init/init_satsuki.cpp
rename to init_satsuki/init_satsuki.cpp
index 1f3c566..5a50e3a 100644
--- a/init/init_satsuki.cpp
+++ b/init_satsuki/init_satsuki.cpp
@@ -36,9 +36,10 @@
 using android::init::import_kernel_cmdline;
 using android::init::property_set;
 
-void property_override(char const prop[], char const value[]) {
+void property_override(char const prop[], char const value[])
+{
     prop_info *pi;
-    
+
     pi = (prop_info*) __system_property_find(prop);
     if (pi)
         __system_property_update(pi, value, strlen(value));
@@ -46,14 +47,23 @@ void property_override(char const prop[], char const value[]) {
         __system_property_add(prop, strlen(prop), value, strlen(value));
 }
 
-void property_override_dual(char const system_prop[], char const vendor_prop[], char const value[]) {
+void property_override_dual(char const system_prop[], char const vendor_prop[], char const value[])
+{
+    property_override(system_prop, value);
+    property_override(vendor_prop, value);
+}
+
+void property_override_triple(char const product_prop[], char const system_prop[], char const vendor_prop[], char const value[])
+{
+    property_override(product_prop, value);
     property_override(system_prop, value);
     property_override(vendor_prop, value);
 }
 
-static void import_kernel_nv(const std::string& key, const std::string& value, bool for_emulator __attribute__((unused))) {
-    if (key.empty())
-        return;
+static void import_kernel_nv(const std::string& key,
+        const std::string& value, bool for_emulator __attribute__((unused)))
+{
+    if (key.empty()) return;
 
     if (key == "oemandroidboot.phoneid") {
         // Dual Sim variant contains two IMEIs separated by comma.
@@ -63,31 +73,25 @@ static void import_kernel_nv(const std::string& key, const std::string& value, b
             property_set("ro.telephony.default_network", "9,1");
             property_set("ro.semc.product.model", "E6883");
             property_set("ro.semc.product.name", "Xperia Z5 Premium Dual");
-            property_override_dual("ro.product.model", "ro.vendor.product.model", "E6883");
+            property_override_triple("ro.product.model", "ro.product.system.model", "ro.product.vendor.model", "E6883");
             property_override_dual("ro.product.name", "ro.vendor.product.name", "satsuki_dsds");
-            property_override_dual("ro.product.device", "ro.vendor.product.device", "satsuki_dsds");
+            property_override_triple("ro.product.device", "ro.product.system.device", "ro.product.vendor.device", "satsuki_dsds");
             property_override("ro.build.description", "satsuki_dsds-user 7.1.1 N-MR1-KITAKAMI-170609-1025 1 dev-keys");
-            property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "Sony/satsuki_dsds/satsuki_dsds:7.1.1/N-MR1-KITAKAMI-170609-1025/1:user/dev-keys");
+            property_override_triple("ro.build.fingerprint", "ro.system.build.fingerprint", "ro.vendor.build.fingerprint", "Sony/satsuki_dsds/satsuki_dsds:7.1.1/N-MR1-KITAKAMI-170609-1025/1:user/dev-keys");
         } else {
-            property_set("persist.radio.block_allow_data", "1");
             property_set("ro.telephony.default_network", "9");
             property_set("ro.semc.product.model", "E6853");
             property_set("ro.semc.product.name", "Xperia Z5 Premium");
-            property_override_dual("ro.product.model", "ro.vendor.product.model", "E6853");
+            property_override_triple("ro.product.model", "ro.product.system.model", "ro.product.vendor.model", "E6853");
             property_override_dual("ro.product.name", "ro.vendor.product.name", "satsuki");
-            property_override_dual("ro.product.device", "ro.vendor.product.device", "satsuki");
+            property_override_triple("ro.product.device", "ro.product.system.device", "ro.product.vendor.device", "satsuki");
             property_override("ro.build.description", "satsuki-user 7.1.1 N-MR1-KITAKAMI-170609-1025 1 dev-keys");
-            property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "Sony/satsuki/satsuki:7.1.1/N-MR1-KITAKAMI-170609-1025/1:user/dev-keys");
+            property_override_triple("ro.build.fingerprint", "ro.system.build.fingerprint", "ro.vendor.build.fingerprint", "Sony/satsuki/satsuki:7.1.1/N-MR1-KITAKAMI-170609-1025/1:user/dev-keys");
         }
     }
 }
 
-void vendor_load_properties() {
+void vendor_load_properties()
+{
     import_kernel_cmdline(0, import_kernel_nv);
-    property_set("dalvik.vm.heapstartsize", "8m");
-    property_set("dalvik.vm.heapgrowthlimit", "192m");
-    property_set("dalvik.vm.heapsize", "512m");
-    property_set("dalvik.vm.heaptargetutilization", "0.75");
-    property_set("dalvik.vm.heapminfree", "512k");
-    property_set("dalvik.vm.heapmaxfree", "8m");
 }
diff --git a/init/Android.mk b/lineage_satsuki.mk
similarity index 57%
rename from init/Android.mk
rename to lineage_satsuki.mk
index e524b98..743c2ac 100644
--- a/init/Android.mk
+++ b/lineage_satsuki.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2020 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,9 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := $(call my-dir)
+$(call inherit-product, device/sony/satsuki/full_satsuki.mk)
 
-include $(CLEAR_VARS)
+# Inherit some common LineageOS stuff
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := \
-	system/core/init \
-	external/selinux/libselinux/include \
-LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
-LOCAL_SRC_FILES := init_satsuki.cpp
-LOCAL_MODULE := libinit_satsuki
-
-LOCAL_STATIC_LIBRARIES := libbase
-
-include $(BUILD_STATIC_LIBRARY)
+PRODUCT_NAME := lineage_satsuki
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d7925e5..bb4e4e2 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -1,28 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
+    Copyright (C) 2016 The CyanogenMod Project
+    Copyright (C) 2017 The LineageOS Project
 
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds.  Do not translate. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- MMS user agent prolfile url -->
-    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.sonymobile.com/E6853R3211.xml</string>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Operating volatage for bluetooth controller. 0 by default-->
-    <integer translatable="false" name="config_bluetooth_operating_voltage_mv">3700</integer>
+    <integer translatable="false" name="config_bluetooth_operating_voltage_mv">3600</integer>
+  
+    <!-- Rx current for bluetooth controller. 0 by default-->
+    <integer translatable="false" name="config_bluetooth_rx_cur_ma">25</integer>
+
+    <!-- Tx current for bluetooth controller. 0 by default-->
+    <integer translatable="false" name="config_bluetooth_tx_cur_ma">25</integer>
+
+    <!-- Idle current for bluetooth controller. 0 by default-->
+    <integer translatable="false" name="config_bluetooth_idle_cur_ma">1</integer>
+
+    <!-- Operating volatage for wifi radio. 0 by default-->
+    <integer translatable="false" name="config_wifi_operating_voltage_mv">3600</integer>
+
+    <!-- Rx current for wifi radio. 0 by default-->
+    <integer translatable="false" name="config_wifi_active_rx_cur_ma">185</integer>
+
+    <!-- Tx current for wifi radio. 0 by default-->
+    <integer translatable="false" name="config_wifi_tx_cur_ma">390</integer>
+
+    <!-- Idle Receive current for wifi radio. 0 by default-->
+    <integer translatable="false" name="config_wifi_idle_receive_cur_ma">3</integer>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 8ee950c..8c7f0d1 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on">89.89</item>
-    <item name="bluetooth.active">0.1</item>
-    <item name="bluetooth.on">0.61</item>
+    <item name="screen.on">27.43</item>
+    <item name="bluetooth.active">48.64</item>
+    <item name="bluetooth.on">1.09</item>
     <item name="bluetooth.at">39.93</item>
-    <item name="screen.full">447.69</item>
-    <item name="wifi.on">2.19</item>
-    <item name="wifi.active">94.22</item>
-    <item name="wifi.scan">0.1</item>
-    <item name="dsp.audio">0.1</item>
-    <item name="dsp.video">0.1</item>
-    <item name="radio.active">178.62</item>
+    <item name="screen.full">393.25</item>
+    <item name="wifi.on">0.97</item>
+    <item name="wifi.active">329.74</item>
+    <item name="wifi.scan">49.42</item>
+    <item name="dsp.audio">38.79</item>
+    <item name="dsp.video">230.86</item>
+    <item name="camera.avg">813.49</item>
+    <item name="camera.flashlight">22.17</item>
+    <item name="radio.active">116.89</item>
     <item name="modem.controller.idle">0.29</item>
     <item name="modem.controller.rx">153.62</item>
     <item name="modem.controller.tx">132.21</item>
     <item name="modem.controller.voltage">0.74</item>
     <item name="radio.scanning">9.37</item>
-    <item name="gps.on">51.70</item>
+    <item name="gps.on">48.81</item>
     <array name="radio.on">
         <value>9.01</value>
         <value>8.28</value>
@@ -89,7 +91,7 @@
         <value>4</value>
     </array>
     <item name="cpu.awake">40.36</item>
-    <item name="battery.capacity">3430</item>
+    <item name="battery.capacity">2900</item>
     <array name="wifi.batchedscan">
         <value>.0002</value>
         <value>.002</value>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
deleted file mode 100644
index ba3e2b5..0000000
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ /dev/null
@@ -1,1356 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<!--Copyright (c) 2016, 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 "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.-->
-
-<carrier_config_list>
-    <!-- Below are some sample filters for various scenarios.
-         You can have multiple carrier_config blocks.
-         blocks for various filters. For more info visit DefaultCarrierConfigService.java
-
-        <carrier_config mcc="1234">
-        //Configs applicable for mcc=1234 and any mnc
-        </carrier_config>
-
-        <carrier_config mcc="1234" mnc="678">
-        //Configs applicable for mcc=1234 and mnc=678
-        </carrier_config>
-
-        <carrier_config device="msm8996">
-        //Configs applicable for msms8996.
-        </carrier_config>-->
-
-    <carrier_config>
-        <boolean name="apn_expand_bool" value="true" />
-        <boolean name="allow_adding_apns_bool" value="true" />
-        <boolean name="hide_preferred_network_type_bool" value="false" />
-        <boolean name="allow_video_call_in_low_battery" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="false" />
-        <!-- Determines whether UI extensions for video calls should be used or not -->
-        <boolean name="video_call_use_ext" value="true" />
-        <!-- Determines if a customized video ui support is required or not -->
-        <boolean name="use_custom_video_ui" value="false" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="false" />
-        <boolean name="config_carrier_cs_retry_available" value="false" />
-        <!-- Controls modify call capabilities
-             FALSE - default capabilities will be retained
-             TRUE - remove modify call capabilities which will hide modify call button -->
-        <boolean name="remove_modify_call_capability" value="false" />
-        <!-- Config to show/hide Video quality toast -->
-        <boolean name="show_video_quality_toast" value="true"/>
-        <!-- Config to show/hide call session event toast like player start/stop -->
-        <boolean name="show_call_session_event_toast" value="true"/>
-        <!-- Config to show/hide data usage toast -->
-        <boolean name="show_data_usage_toast" value="true"/>
-
-    </carrier_config>
-
-    <carrier_config mcc="204" mnc="04">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="222" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="840">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="854">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="855">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="856">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="857">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="858">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="859">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="860">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="861">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="862">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="863">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="864">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="865">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="866">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="867">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="868">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="869">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="870">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="871">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="872">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="873">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="405" mnc="874">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <boolean name="video_call_use_ext" value="false" />
-        <boolean name="use_custom_video_ui" value="true" />
-        <boolean name="config_hide_preview_in_vt_confcall" value="true" />
-        <boolean name="config_carrier_specific_network_type_display" value="true"/>
-        <boolean name="remove_modify_call_capability" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="show_static_image_ui" value="true"/>
-        <boolean name="config_dds_switch_alert_dialog_supported" value="true"/>
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_with_iccids_array" num="6">
-            <item value="iccid"/>
-            <item value="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,8991870,8991871,8991872,8991873,8991874"/>
-            <item value="type"/>
-            <item value="ims,emergency"/>
-            <item value="include_common_rules"/>
-            <item value="false"/>
-        </string-array>
-        <boolean name="show_video_quality_ui" value="true" />
-        <boolean name="vowifi_call_quality" value="true" />
-        <boolean name="config_retry_sms_over_ims" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="440" mnc="50">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_carrier_ims_call_deflect" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="440" mnc="51">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_carrier_ims_call_deflect" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="450" mnc="05">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="allow_video_call_in_low_battery" value="false" />
-        <boolean name="config_carrier_cs_retry_available" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="450" mnc="06">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="allow_video_call_in_low_battery" value="false" />
-    </carrier_config>
-
-    <carrier_config mcc="450" mnc="08">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="allow_video_call_in_low_battery" value="false" />
-        <boolean name="config_carrier_cs_retry_available" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="454" mnc="00">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="454" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="454" mnc="04">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="454" mnc="31">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="455" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,mms"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="455" mnc="07">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,mms"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="00">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="ascii_7_bit_support_for_long_message" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,mms"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="04">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="06">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="07">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="08">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_enable_callbarring_over_ims" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false"/>
-        <boolean name="show_call_session_event_toast" value="false"/>
-        <boolean name="show_data_usage_toast" value="false"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="fota,ims"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="09">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="10">
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="11">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="ascii_7_bit_support_for_long_message" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,mms"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="460" mnc="12">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="ascii_7_bit_support_for_long_message" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type"/>
-            <item value="supl,mms"/>
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="00">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="true"/>
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="030">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="070">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="080">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="090">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="030">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="150">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="170">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="280">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="380">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="410">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="560">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="680">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_display_14digit_imei" value="true" />
-        <boolean name="transmit_static_image" value="true"/>
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="980">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="260">
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="true"/>
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="160">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="200">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="210">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="true"/>
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="220">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="230">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="240">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="250">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="270">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="300">
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="310">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="490">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="530">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="580">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="590">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="640">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="660">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="310" mnc="800">
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="311" mnc="180">
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_upgrade_supported" value="true"/>
-        <boolean name="carrier_rtt_downgrade_supported" value="true"/>
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-
-    <carrier_config mcc="311" mnc="480">
-        <boolean name="support_video_conference_call_bool" value="false"/>
-        <boolean name="carrier_rtt_supported" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="false"/>
-        <boolean name="carrier_rtt_upgrade_supported" value="false"/>
-        <boolean name="support_downgrade_vt_to_audio_bool" value="true" />
-    </carrier_config>
-
-</carrier_config_list>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml
deleted file mode 100755
index 74a7c9d..0000000
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2012, The Linux Foundation. All rights reserved.
-
-    Not a Contribution, Apache license notifications and license are retained
-    for attribution purposes only.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to enable ETWS settings (Japan) -->
-    <bool name="show_etws_settings">true</bool>
-    <!-- Whether to enable CMAS settings (United States) -->
-    <bool name="show_cmas_settings">true</bool>
-    <!-- Whether to enable channel 50 settings (Brazil) -->
-    <bool name="show_brazil_settings">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
index 0c6fb43..9f6192e 100644
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2007 The Android Open Source Project
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
+
           http://www.apache.org/licenses/LICENSE-2.0
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/overlay/packages/apps/Settings/res/values/dimens.xml b/overlay/packages/apps/Settings/res/values/dimens.xml
index c342304..6f33e51 100644
--- a/overlay/packages/apps/Settings/res/values/dimens.xml
+++ b/overlay/packages/apps/Settings/res/values/dimens.xml
@@ -19,3 +19,4 @@
     <item name="fingerprint_sensor_location_fraction_x" type="fraction">51.00%</item>
     <item name="fingerprint_sensor_location_fraction_y" type="fraction">51.00%</item>
 </resources>
+
diff --git a/overlay/packages/apps/Settings/res/values/strings.xml b/overlay/packages/apps/Settings/res/values/strings.xml
deleted file mode 100644
index b42e4c0..0000000
--- a/overlay/packages/apps/Settings/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
-    <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">
-        Locate the fingerprint sensor on the side of your phone.</string>
-</resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e0e3e66..33613c8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -11,8 +11,7 @@ etc/acdbdata/Sony/Sony_Speaker_cal.acdb
 etc/firmware/BCM43xx.hcd
 
 # Camera
-bin/mm-qcamera-daemon:vendor/bin/mm-qcamera-daemon
-lib/hw/camera.msm8994.so:vendor/lib/hw/camera.msm8994.so
+bin/mm-qcamera-daemon
 lib/hw/camera.qcom.so
 lib/libcamera_clientsemc.so
 lib/libcammw.so
@@ -45,7 +44,6 @@ lib/libsomc_yummyrsc.so
 lib/libsony_fooddetect.so
 lib/libsony_naruto.so
 lib64/libcamera_clientsemc.so
-vendor/lib/libchromaflash.so
 vendor/lib/libfastcvadsp_stub.so
 vendor/lib/libjpegdhw.so
 vendor/lib/libjpegdmahw.so
@@ -138,13 +136,9 @@ vendor/lib/libmmjpeg.so
 vendor/lib/libmmqjpeg_codec.so
 vendor/lib/libmmqjpegdma.so
 vendor/lib/liboemcamera.so
-vendor/lib/liboptizoom.so
 vendor/lib/libqomx_jpegdec.so
 vendor/lib/libqomx_jpegenc.so
 vendor/lib/libqomx_jpegenc_pipe.so
-vendor/lib/libseemore.so
-vendor/lib/libtrueportrait.so
-vendor/lib/libubifocus.so
 vendor/lib64/libmmcamera2_q3a_core.so
 vendor/lib64/libmmcamera2_sensor_debug.so
 vendor/lib64/libmmcamera2_stats_algorithm.so
@@ -520,7 +514,7 @@ lib/libsomc_chokoballcmn.so
 lib/libsomc_chokoballpal.so
 
 # DRM
-bin/qseecomd:vendor/bin/qseecomd
+bin/qseecomd
 vendor/lib/libQSEEComAPI.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
@@ -540,112 +534,13 @@ vendor/lib64/lib-sec-disp.so
 vendor/lib64/libssd.so
 vendor/lib64/libStDrvInt.so
 
-# Modem
-etc/customization/modem/amss_fs_empty.mbn
-etc/customization/modem/amss_fsg_satsuki_a1_austria_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_att_us_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_beeline_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_bell_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_bell_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_bouygues_france_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_china_mobile_hk_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_china_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_cht_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_csl_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ctm_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_docomo_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ee_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ee_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ee_vowifi_only_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_emt_estonia_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_fareastone_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_france_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_gteb_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_austria_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_austria_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_denmark_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_hk_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_ireland_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_italy_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_sweden_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_sweden_vowifi_only_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_uk_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_uk_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_hutch_uk_volte_vowifi_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_india_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_indonesia_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ir51_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ir51_ir92_ims_gte_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ir51_ir92_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ir92_ims_gte_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_ir92_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_jazztel_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_kpn_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_m1_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_megafon_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_movistar_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_mts_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_france_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_france_pp_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_france_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_poland_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_romania_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_spain_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_spain_vowifi_only_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_orange_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_pccw_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_reliance_jio_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_rogers_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_rogers_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_salt_switzerland_vowifi_only_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_sfr_france_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_singtel_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_smartone_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_starhub_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_swisscom_switzerland_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_taiwanmobile_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telcel_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tele2_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tele2_netherlands_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_germany_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_germany_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_spain_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_spain_vowifi_only_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_uk_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telefonica_uk_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telekom_czech_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telekom_czech_volte_vowifi_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telekom_germany_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telekom_germany_volte_vowifi_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telekom_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telenor_norway_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telenor_norway_volte_vowifi_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telia_norway_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telia_sweden_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telstra_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telstra_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_telstra_trial_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tim_italy_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tim_italy_volte_vilte_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tim_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_tmobile_us_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vivo_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone3_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone4_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone5_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone_germany_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone_nl_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone_spain_ims_tar.mbn
-etc/customization/modem/amss_fsg_satsuki_vodafone_uk_ims_tar.mbn
-
 # NFC
 lib64/hw/libpn547_fw.so
 
 # Sensors
 etc/sensors/hals.conf:vendor/etc/sensors/hals.conf
 etc/sensors/sensor_def_qcomdev.conf
-bin/sensors.qcom:vendor/bin/sensors.qcom
+bin/sensors.qcom
 vendor/lib/libdataitems.so
 vendor/lib/libsensor1.so
 vendor/lib/libsensor_reg.so
@@ -682,10 +577,10 @@ etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin
 
 # Fingerprint
 vendor/firmware/tzfingerprint.mdt
-vendor/firmware/tzfingerprint.b00
 vendor/firmware/tzfingerprint.b01
 vendor/firmware/tzfingerprint.b02
 vendor/firmware/tzfingerprint.b03
+vendor/firmware/tzfingerprint.b00
 lib/lib_fpc_tac_shared.so
 lib64/lib_fpc_tac_shared.so
 lib/hw/fingerprint.msm8994.so
diff --git a/system.prop b/system.prop
index e2175f9..a4abbe9 100644
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1,16 @@
-# system.prop for Satsuki
+# Dalvik
+ro.sys.fw.dex2oatthreadcount=6
+dalvik.vm.boot-dex2oat-threads=6
+dalvik.vm.dex2oat-threads=6
+dalvik.vm.image-dex2oat-threads=6
+dalvik.vm.dex2oat-filter=speed
+dalvik.vm.image-dex2oat-filter=speed
+dalvik.vm.heapgrowthlimit=256m
+dalvik.vm.heapstartsize=8m
+dalvik.vm.heapsize=512m
+dalvik.vm.heaptargetutilization=0.75
+dalvik.vm.heapminfree=512k
+dalvik.vm.heapmaxfree=8m
 
 # Display density
 ro.sf.lcd_density=480