Apply patch fixing trace-viewer: https://codereview.appspot.com/120720044