Merge "Black list more trace tests."