Merge "Add notification listener using the new shell command." into oc-mr1-dev
am: a322dd9920

Change-Id: I3cc5f6cb367ebf17e032d2ed6c91cb9f6eaffa75