Merge "Remove unused imports from some PTS filesystemperf tests"