Merge "Make concurrent runs of FileBackendTest independent"