Merge "Disable scenario test for trunk subports connectivity on Queens"