am afdd5be1: am 915d2e98: Merge "Move the listener code into its own file."

* commit 'afdd5be1fbf4dca8e9cd717862880b0d01b7f070':
  Move the listener code into its own file.