Merge "Mark as vendor_available" am: 462f68aa27 am: dddb13851c
am: 217ec5922a

Change-Id: I71da391bea5460efc2ff83113286daee34d23082