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