am 0edee1bf: am 403ef95b: Merge "Add another test to the trace test black list."

* commit '0edee1bf7fc9e4b68fdb213aa4bdbd943cd1db25':
  Add another test to the trace test black list.