Merge changes from topic 'configstore' am: e3a0c607cd am: fb64badb3e
am: e0ca61a6be  -s ours

Change-Id: I12c920d8b2e1a1734c822d3badc4195dee82bcfc