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

Change-Id: I6e33aad2c993029d3c1e6be139108edf4ebaf136