Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 am: 54138462b4
am: 327193d252

Change-Id: I20661bb18d6728abcaa9411805e81336c0832885