Merge "Fix Connectivity Manager test:"