Merge changes from topic 'configstore-utils-log'
am: e8600fe892

Change-Id: I28f7348da2c6656db4c0ac27bb3fa066d1396d9e