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

Change-Id: I3ad448137fce55ac5da0be114a78e63627ad05ff