Merge "Fix NPE in ConnectivityService"