Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a am: 4bccabef90
am: 7d6a9dc4e8

Change-Id: I0a50689a695a56b82ae380a4a165c2baf1617546