Merge "Trace some interesting events" into lmp-mr1-dev