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

Change-Id: I7f2a4d76e0461ec3d7cb03d4b3f7b30a7715dcb7