Merge changes from topic 'vendor_available_libgui' into oc-dr1-dev am: 8c72947af1
am: a6fd7fedac

Change-Id: I367f259ab8e78091ca36d96d18b12510ab067344