Merge "fixes for connectivity manager test suite" into lmp-dev