Merge "configstore-utils: vendor_available"
am: c3e640c7f0

Change-Id: Ied49d6affe69099bc08a58e1d5e38052d018a2e8