Merge "Allow vndservicemanager to self-register."