Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am: a60f7151e6

Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1