am 76c4a1bf: Merge "Keep up with INotificationListener changes." into jb-mr2-dev

* commit '76c4a1bf7c1f8e2b895bd99aa4815954e9e9bc16':
  Keep up with INotificationListener changes.