Merge "Revert ConnectivityServiceDependencies access modifier"