Merge changes from topic 'hidl-vendor-available' into oc-dev
am: 17f0c0dde7

Change-Id: I277bade95b1ed2c46e982f3c03145121a0248080