Merge "Database: Avoid internal use of ignoreErrors()"