Made DB rollback() method properly bail out if no trx is active

Change-Id: I157b3c9e7a869866c08d127cb7f9277582e1bc9e
Merge "Made DB rollback() method properly bail out if no trx is active"