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

Change-Id: I8ded4dc6c74e00dd9c3f94dabb29fd833d81e58b