Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler"