Listening refactoring in plugins.

Change-Id: I9e7aeda9637f6139fed7039e7111c44e8e5783dc