issue: 420849 handling case when leading conn and second conn are the same (in case of forward)

Change-Id: I9fb5192b4924358dfb4be89900cd57de988be9ed