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

Change-Id: Ia3379660fc8f21170c09ec98d95ac6f223b566d3