Merge "Add a test for ConnectivityFrameworkInitializer"