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

Change-Id: I540802c6207fd80beb8dfe1298d33e0efea3549e