Update comments and imports after DataChangeListener changes