
Move below two changes from legacy to connection manager: 'Change-Id: If3bb344ec7058d4149d0064975d7c91f213fd105', 'Change-Id: I39a84d06b9c696179da1b854985a23b874a399c5' Change-Id: I33921497d966f08a0ca476a373cfe6527888ca39 CRs-Fixed: 2765469
Move below two changes from legacy to connection manager: 'Change-Id: If3bb344ec7058d4149d0064975d7c91f213fd105', 'Change-Id: I39a84d06b9c696179da1b854985a23b874a399c5' Change-Id: I33921497d966f08a0ca476a373cfe6527888ca39 CRs-Fixed: 2765469