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

Change-Id: I770e5dd74698ef5dc10158e2664ac9fd847db813