Merge "Remove Listener dependency in the telecom test app." am: 83b0330922 am: ba45d05c0b
am: b218027b1a

Change-Id: If526b86f85980c351942751dde23327d84fc6ecf