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

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