am 681527d6: Merge "Update to latest trace-viewer"

* commit '681527d63fa3a576cb26aadb7259a049dfec1810':
  Update to latest trace-viewer