Merge "Remove unnecessary imports in DumpWriter"