Merge "Fix RollbackUnitTest when deleting rollback."