Mark as vendor_available am: 5626fc0816 am: 8d643497ec
am: 0bda927d40

Change-Id: I2cf3f524d7951bb3eb9d53233169a88cd373fe07