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