Merge "Add vendor_available:true" am: 7c703a6b30 am: 9e0e8c7b93 am: 434a9a9032
am: 3152488128

Change-Id: Id6d7974f83e264a241b4b13936d615bc72a9a817