Mark as vendor_available am: a93d177f03
am: f705a6d41e

Change-Id: I7a646cf69a5c0dad7cdc3abaf4d783819c7f31e5