Merge "Remove unnecessary use of List in FileUtils"