Merge "revert recent changes around system listener registrations" into nyc-dev
am: 46820517e4

* commit '46820517e449de678ac103a39b69276efe412eed':
  revert recent changes around system listener registrations