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

* commit 'e046262d2d5883b800187a558c32883e1b87d33d':
  fixes for connectivity manager test suite