Merge "Mark as vendor_available"
am: d03d569f06

Change-Id: I685b097e616aa605eaacc917d1de75e45555fc52