Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev