Repair usage of ImmediateWatchTopicListener

Change-Id: Ic0596f6ea2652764bd8fa324ae218c9f40010f93
Merge "Repair usage of ImmediateWatchTopicListener"