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

Change-Id: I6fb40f95ed793c08e9d53be61b26856cf0d088cb