Carry ListenerManager changes forward

Change-Id: Icdc6996b1a259b4cb62d1b8dc2ce2e89e2cbb550
1 file changed