Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev