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

Change-Id: I57636cd83a525426c8bf399c268c584fa4eb92f6