diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 9ecfa6cd..90f30a7f 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -25,6 +25,7 @@
 // skips conn update at conn completion
 #define BTA_BLE_SKIP_CONN_UPD  FALSE
 #define BLE_PERIPHERAL_ADV_NAME  FALSE
+#define BTM_LE_SECURE_CONN  TRUE
 #define BT_CLEAN_TURN_ON_DISABLED 1
 
 #define BTA_DISABLE_DELAY 1000 /* in milliseconds */
diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
index 0692d72c..86bde6ca 100644
--- a/configs/thermal-engine.conf
+++ b/configs/thermal-engine.conf
@@ -4,8 +4,8 @@
 #algo_type monitor
 sampling 10000
 sensor case_therm
-thresholds 48000 58000
-thresholds_clr 45000 54000
+thresholds 70000 70000
+thresholds_clr 69000 69000
 actions modem modem
 action_info 2 3
 
@@ -13,7 +13,154 @@ action_info 2 3
 #algo_type monitor
 sampling 10000
 sensor case_therm
-thresholds 45000 58000
-thresholds_clr 43000 54000
+thresholds 70000 70000
+thresholds_clr 69000 69000
 actions modem_proc modem_proc
 action_info 1 3
+
+[FRONT_TEMP]
+algo_type        virtual
+trip_sensor      msm_therm
+set_point        -18000
+set_point_clr    -20000
+sensors          msm_therm pa_therm0 chg_therm batt_temp
+weights          110       100       85        110
+offsets          -2000     -2000     -2000     -2000
+sampling         10000
+math             0
+sys_temp
+
+[REPORT-FRONT-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           FRONT_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[BACK_TEMP]
+algo_type        virtual
+trip_sensor      msm_therm
+set_point        -18000
+set_point_clr    -20000
+sensors          msm_therm pa_therm0 chg_therm batt_temp
+weights          110       100       85        110
+offsets          -1000     -1000     -1000     -1000
+sampling         10000
+math             0
+sys_temp
+
+[REPORT-BACK-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           BACK_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[SS-BATT-BATT]
+algo_type        ss
+sampling         5000
+sensor           batt_therm
+device           battery
+set_point        44000
+set_point_clr    42000
+
+[SS-CHG-BATT]
+algo_type        ss
+sampling         5000
+sensor           chg_therm
+device           battery
+set_point        50000
+set_point_clr    44000
+time_constant 0
+
+[VIRTUAL-MSM-CPU]
+algo_type        virtual
+trip_sensor      msm_therm
+set_point        41000
+set_point_clr    39000
+sensors          tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7
+weights          1       1       1        1
+sampling         1000
+math             0
+
+[SS-MSM-CPU]
+algo_type        ss
+sampling         1000
+sensor           VIRTUAL-MSM-CPU
+device           battery
+set_point        43000
+set_point_clr    40000
+
+[VIRTUAL-MSM-GPU]
+algo_type        virtual
+trip_sensor      msm_therm
+set_point        41000
+set_point_clr    39000
+sensors          tsens_tz_sensor15
+sampling         1000
+math             2
+
+[SS-MSM-GPU]
+algo_type        ss
+sampling         1000
+sensor           VIRTUAL-MSM-GPU
+device           battery
+set_point        43000
+set_point_clr    40000
+
+[SS-MSM-CLUSTER0]
+algo_type        ss
+sampling         1000
+sensor           msm_therm
+device           cluster0
+set_point        43000
+set_point_clr    41000
+device_max_limit 1401600
+
+[VIRTUAL-CPUS]
+algo_type        virtual
+trip_sensor      tsens_tz_sensor9
+set_point        75000
+set_point_clr    65000
+sensors          tsens_tz_sensor9 tsens_tz_sensor10 tsens_tz_sensor11 tsens_tz_sensor12 tsens_tz_sensor13 tsens_tz_sensor4 tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor8
+sampling         50
+math             2
+
+[SS-GPU]
+algo_type        ss
+sampling         250
+sensor           gpu
+device           gpu
+set_point        95000
+set_point_clr    65000
+
+[SS-POPMEM]
+algo_type        ss
+disable
+sampling         250
+sensor           pop_mem
+device           cluster0
+set_point        70000
+set_point_clr    55000
+time_constant    2
+
+[SS-CPUS-ALL]
+algo_type        ss
+sampling         50
+sensor           VIRTUAL-CPUS
+device           cluster0
+set_point        95000
+set_point_clr    55000
+
+[MONITOR-CAMERA-MSM]
+algo_type          monitor
+sampling           1000
+sensor             msm_therm
+thresholds         52000    56000
+thresholds_clr     47000    53000
+actions            camera   camera
+action_info        1        2
diff --git a/system.prop b/system.prop
index 9858fab0..c33bbc9b 100644
--- a/system.prop
+++ b/system.prop
@@ -183,3 +183,26 @@ ro.sys.fw.trim_enable_memory=2147483648
 
 # Wifi
 wifi.interface=wlan0
+
+# Property for game detection feature
+debug.enable.gamed=0
+
+# Min/max cpu in core control
+ro.core_ctl_min_cpu=2
+ro.core_ctl_max_cpu=4
+
+#HWUI properties
+ro.hwui.texture_cache_size=72
+ro.hwui.layer_cache_size=48
+ro.hwui.r_buffer_cache_size=8
+ro.hwui.path_cache_size=32
+ro.hwui.gradient_cache_size=1
+ro.hwui.drop_shadow_cache_size=6
+ro.hwui.texture_cache_flushrate=0.4
+ro.hwui.text_small_cache_width=1024
+ro.hwui.text_small_cache_height=1024
+ro.hwui.text_large_cache_width=2048
+ro.hwui.text_large_cache_height=1024
+
+# Set cutoff voltage to 3400mV
+ro.cutoff_voltage_mv=3400