Mark as vendor_available am: a756c603bf am: 573c1c6da1
am: aefa89fb79

Change-Id: Ia3ff6c60838a8e59db13d165c86595b2cee6fa43