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

Change-Id: I7597da9eb3c0515d26897d46edce90e7b5f240fd