Merge "Fix NullPointerException in ConnectivityService"