Merge "Added dialog to notify user of thermal shutdown" into oc-dev
am: 4d09adcef1

Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851