Merge "fix filter for listeners that are not the rocket" into nyc-dev
am: 2e35847a8f

* commit '2e35847a8f9557b59198fc053524eee0b965aab8':
  fix filter for listeners that are not the rocket

Change-Id: Ieb343c93c78dbafb937a14abff6a868d1f44ecc9