Merge "Fix connectivitymanagertest"