Merge "Improve logging around performance critical events" into lmp-mr1-dev