Merge "Add notification listener plugin hook" into oc-dr1-dev am: 8f8b5ac031
am: 05ac6544c9

Change-Id: I30313673df89ae8a60d4da5b1da62bceb35430d3