Merge "Fix callForwarding logic by considering responseIntArrayList" am: f0b6ff4573 am: d1141f9126 am: a07756129e

Change-Id: I36145be3235361b312d1a71f7f54542dd65558d8