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

Change-Id: I225d4567fccad67a4d958060fbaf3b668c78ea87