Merge "Mark as vendor_available"
am: 39a2e208fa

Change-Id: I876ba572be5c6ce228a09199a90499d278306c3f