Merge "configstore: respect service registration status." am: e8e87df57f
am: 9761a112e1

Change-Id: Ie4094649cf67652ee8af8ba5f49c700c2533abbd