Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 am: d8df5485eb
am: 01ce8b0f61

Change-Id: I9a258472b788818aca9373adc342363a8b440463