Merge "Fix bug in stats_event_benchmark" am: 3bf8858105 am: ae9375f13e am: 759c6ff425

Change-Id: I9446a60a7aa33d913d92b13f60690f5b7f903790