Merge "Mark as vendor_available" into oc-dev