Merge "Fix bug in stats_event_benchmark"
am: 3bf8858105

Change-Id: I2194294ddc098edcba44172d82fca061f21b5f3b