Merge "configstore-utils: add feature to cache service handles" am: 03b02609ff
am: fbb8bb0671

Change-Id: Ic1cd2c7010fd122e0939bb993bc4211010ff756f