Merge changes from topic 'configstore'
am: e3a0c607cd

Change-Id: I3b50189813bde7b84e9e545e37717a4e8bda5801