Merge "Mark as vendor_available" am: 531062feac
am: c47a69a241

Change-Id: I117b9d369d5a55c4dd803ec0c0113bc76caf0c1a