[automerger skipped] Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a am: 4bccabef90 am: 7d6a9dc4e8 am: bbbe4b1c39 -s ours
am: 1c3d8399ed -s ours
am skip reason: change_id Iae69c5db070c5e58ae5d37c12d1c4df027138611 with SHA1 13f23a8580 is in history

Change-Id: I41422141e071013519f16982b27b8b8f499a48a8