Merge "vndservicemanager: load vendor service_contexts." into oc-dev