Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev
am: 1ac5238f91

Change-Id: Ic3e17dbc7380a35281dbb13ef6d60c501fbd1135