Merge "configstore-utils: vendor_available"