Merge "Report the temperature during an OTA update" am: 47c7e7f41a
am: 022682a721

Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0