Merge changes from topic 'configstore' am: e3a0c607cd
am: fb64badb3e

Change-Id: Ia4da72dc31ec235dd3aa0710846fc1504a0fd884