Merge "Have connectivity self-register manager classes"