Using transaction when dropping tables, so that the DB never enters an inconsistant state
am: e05b08f705

Change-Id: I31d730782d64eb7e174efe27850eaf2428b11d4c