Merge "Avoid use of DB rollback() in LocalFileMoveBatch"