Merge "Use thread safe set for adapter set" into lmp-dev