Merge "system_server is a client of configstore" into oc-dr1-dev