am 56aafd8c: Merge "Update to latest trace viewer"

* commit '56aafd8c5dbfad107348a9521f5255ab21054893':
  Update to latest trace viewer