Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into...
Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am: 84626a4e" into oc-dr1-dev-plus-aosp am: 4802b828" into oc-mr1-dev-plus-aosp
am: 987fb55c
Change-Id: Iac7925ce9d03da038be8d7d5acc59c41134add26