Merge "Add vendor_available:true"
am: 7c703a6b30

Change-Id: I49438c09f41b41bbe4e9de75819c618b1326d5d2