Cleaned up ChangeEventListener

Change-Id: I194753539950485219ea9ec2323fa51219b55cbe