Merge "Mark as vendor_available" am: 39a2e208fa
am: c985524d71

Change-Id: I2637982aa16b7f4ece70522280343fa6bcfdd569