Merge "Mark libion vendor_available." into oc-dev