DO NOT MERGE: Listener of spam events am: 486ee39d07
am: a02f78b0d3  -s ours

* commit 'a02f78b0d3fad3b7382fcceb0e6de362733fda65':
  DO NOT MERGE: Listener of spam events