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

Change-Id: I9db78e30ec60088e09384a8134304f0f73bd391e