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

Change-Id: I0c7aaca60c1ccb8ef904c656a9e5ae1d6613c8ec