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

Change-Id: I528fc4914ab9b1da49825b425bd5672e0b117add