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

Change-Id: Ic28ebd02a85517472a18aa5c6a0f69820afd86fb