Fix for dropdb()

Change-Id: I2cd4862f02dedaa034aad75900b3a8a2d32da8b9
Closes-Bug: #1323350