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

* commit '14eb1f8e20e4dc7092f62efb82b4c066c7da0a10':
  Black list more trace tests.