Merge "Add ability to dump events in a timeline view." am: 255a171c5d
am: 3b27d69612

Change-Id: I5363916199a33e795fcfb8497815687cda91f6ef