Nougat IOT Release (ThinQ Speaker)
Merge "Delete unmerged row on update conflict"