Merge "Allow vndservicemanager to self-register." into rvc-dev