Android Things LTS v1.0.0 (4760714)
Merge "Delete unmerged row on update conflict"