Merge "configstore-utils: vendor_available" am: c3e640c7f0 am: 759e1d28bd am: 51ba6a1e43
am: c2af01d66b

Change-Id: If892a18b257de48fb3ba983ddaefd2e94da9ef0d