am 607cf217: Merge "Black list more trace tests."

* commit '607cf2177cd0faceb6c7ca425774557dd62f092b':
  Black list more trace tests.