am 83182ed4: Merge "Reduce lock contention when debugging" into lmp-dev

* commit '83182ed48c55729cd34780fc598f269cc98af739':
  Reduce lock contention when debugging