Merge "BUG-3033: DataBroker should extend DataTreeChangeService"