Merge "Pass int for argument to ArchivedFile"