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

Change-Id: I34c3327e675d1948ae6074337cce800919e03030