Merge "Tests for CDS DataTreeChangedListener"