Merge "FSFile and TempFSFile cleanups"