Merge "Add target for vndservice_contexts." into oc-dev