Merge "Fix NPE in ConnectivityService" into klp-dev