Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am: 84626a4e" into oc-dr1-dev-plus-aosp