Merge "Mark as vendor_available" am: 39a2e208fa am: c985524d71
am: 5465ba3b98  -s ours

Change-Id: I2456f69822f1f5f82bef8b8a79011d7d16dc5e49