Merge cherrypicks of ['googleplex-android-review.googlesource.com/22106283'] into tm-qpr2-b-release.
Change-Id: Ibd8ce27933e83565e1c05dbab3fbf06e352e19ab
diff --git a/device-lynx.mk b/device-lynx.mk
index 4dd44ac..1b31191 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -227,7 +227,8 @@
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.camera.extended_launch_boost=1 \
persist.vendor.camera.optimized_tnr_freq=1 \
- persist.vendor.camera.raise_buf_allocation_priority=1
+ persist.vendor.camera.raise_buf_allocation_priority=1 \
+ persist.vendor.camera.start_cpu_throttling_at_moderate_thermal=1
# Enable camera 1080P 60FPS binning mode
PRODUCT_VENDOR_PROPERTIES += \