Merge "Track Multiple Event Instances in EventReporter" am: fcd1db63bd am: bb79b309cf
am: ca25a3a94a

Change-Id: Ia8223f2246c33c6a232824052022ac8ff2727c41