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

* commit 'a5f9c634028a85fda77cdda66800c0d25327fae8':
  revert recent changes around system listener registrations