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

Change-Id: I30de198a55d1a283db949498e887a06f9565bbe2