Merge "Avoid INSERT..SELECT in LocalFileDeleteBatch"