Merge "Mark configstore-utils as double_loadable"