am 51bf0f69: Merge "Update to latest trace-viewer"

* commit '51bf0f69bd0aaadec66577b20ef3c839e5cd7839':
  Update to latest trace-viewer