Merge "Revert "Revert "Check that tracefs files are labelled as tracefs_type"""