Merge "Mark libion vendor_available." am: b538f96fe1 am: 44895afce3 am: ff13a63035
am: 2666b4f40d

Change-Id: Ie414c283e1551dcf8e9f6a4cde1a36005892be9d