Merge "Fix native stats_event logging"