Merge "system_server is a client of configstore" into oc-dr1-dev
am: 25578a3096

Change-Id: I1d49bdbd662e4037843a2c6af4954a4a926c8543