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

Change-Id: I86407072bf4bbef94dc625dede248a2e9b29719f