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

Change-Id: Ib9786e85a047d48bc57c5d60eb9c1839eb425b03