Merge "follow up minor fixes for connectivity manager test" into lmp-dev