Merge "Mark as vendor_available" am: d03d569f06
am: b365ddfbf5

Change-Id: I52bf41fd520c08904c24ec63353f57e30b2eafe3