diff --git a/conf/init.tegu.rc b/conf/init.tegu.rc
index 4c589bf..8b35f0f 100644
--- a/conf/init.tegu.rc
+++ b/conf/init.tegu.rc
@@ -67,3 +67,10 @@ on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_complet
 
 on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
     write /sys/devices/virtual/goog_touch_interface/gti.0/screen_protector_mode_enabled 1
+
+# For Japan sku, always enforce camera shutter sound
+# Since this property is read by the audio server in system service,
+# it should be written by the system init.
+on property:ro.boot.hardware.sku=G3Y12
+    setprop audio.camerasound.force true
+
diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json
index b38a39c..1ebf2ad 100644
--- a/thermal/thermal_info_config_charge_tegu.json
+++ b/thermal/thermal_info_config_charge_tegu.json
@@ -108,8 +108,8 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0],
-            "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index eab9ee0..64cfb92 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -873,8 +873,8 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0],
-            "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,