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

Change-Id: I9fc5652422f983e37c195abec84ba594993d1407