Merge "use correct trace debug level" into lmp-dev