Merge "Mark configstore-utils as double_loadable" am: a7b9291b82
am: eba42a4d6b

Change-Id: I02a99829a260941216c7365b350d159ae83fd79d