Android O IOT Preview 8 (4718959)
Merge "Delete unmerged row on update conflict"