Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp