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

Change-Id: I97b1258c8a41413bd4354d6f1e9441456102d612