Merge "Fix ConnectivityPreferenceControllerTest failures"