Merge "Refactor TAPI Connectivity Utils"