Merge "Temperature atom: Use int instead of float." into pi-dev
am: 31c807c987

Change-Id: I736aa42f02e9d303fc76dca20349471a5219821d