Merge "Enable tracing of the ion/ion_stat events"