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

Change-Id: I83a4e64b7237316b4aa8c4c68336fe246538e6e2