Merge "CEC: Remove listener records only if they are currently used" into nyc-dev am: 23cd9da
am: 410f39c

* commit '410f39c8068b04976be3a0d163ded82179c82e39':
  CEC: Remove listener records only if they are currently used

Change-Id: Id4a7019e9262b16b54c011d50ecab348d437c954