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