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

Change-Id: Idee6c6e13206c59af76d8e22842894ca8bb2333c