Android o preview 2
Merge "Mark as vendor_available"