Add vendor_available:true am: 052c3d1f20  -s ours
am: e88d497136  -s ours

Change-Id: I56fe683cc9255c168c90dfef36330d112d700050