Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am: 84626a4e3d" into oc-dr1-dev-plus-aosp am: 4802b828a2" into oc-mr1-dev-plus-aosp