Merge "configstore-utils: vendor_available" into oc-dev
am: 3dca679b80  -s ours

Change-Id: Ic88ab64c96a097bbaa032f4ac6ce82cfc2c669db