Merge "Merge "Report the temperature during an OTA update" am: 47c7e7f41a am: 022682a721 am: 998c554463" into oc-dev am: 217ecd0729
am: 08fa7112b5

Change-Id: I905402c969f9be0215c0e35ccd8e2decf037b153