configstore: add new configuration item am: cb71410f16 am: 35ad8cf50d
am: 4b7759c251  -s ours

Change-Id: Ieb5e5416a3eecd1fde02cc3caaabeb95c1d8a7c8