Merge "Guard against NPE in ServiceConnector" into rvc-dev