Merge "Remove TEMP_FAILURE_RETRY for unlink"