Merge "Implement DataChangeListener"