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

Change-Id: Ib1a0fa4221890b02937bc44d3293a65b5508d12f