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

Change-Id: I4c3c5be04aaa1eee409ea706b387370cedf5b15b