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

Change-Id: I21a67fee1ddb79fa2f1d5845d40a2a2cb04e73b7