Merge "Log temperature during OTA update" am: bc2c51a97f
am: 1d7e500bfc

Change-Id: I44a64b7cf0054fcc4cea9b6124c3f6a089f268e1