Merge "Mark as vendor_available" into oc-dev
am: b5213bb7f9

Change-Id: I6de8ea7c4dcebca83e78db6cbc3e2c051a312cb8