Merge changes from topic 'configstore-utils-log' am: e8600fe892 am: 725cbd866c am: cb1953b3a7  -s ours
am: 5c84e07474  -s ours

Change-Id: Ieb5c46fc501b1ed4ab456f0c669284399c5ed842