Merge "Registering Distributed Datastore for SchemaContext changes"