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

* commit '23cd9dab01bff3ce7bd2fd275411fc99a903f2b4':
  CEC: Remove listener records only if they are currently used

Change-Id: I78186db4ad9369dfe90969bbbb680cd463e642d5