Merge "Mark as vendor_available"
am: 531062feac

Change-Id: I7da147494730980108d7bbcabec08b8caa3347e5