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

Change-Id: Icee3b6f4a437d8165483e1070fe88888879e5615