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

Change-Id: If8e64c556fabbaf1036b5836f25f10168f52a996