Merge "Delete Database before removing from list" am: a298b8692c
am: 71d3c128ff

Change-Id: I643e02d9ac7fc3470dd6768f9214dc98150cbbf2