Merge "Fix kotlin nullable errors in Connectivity tests" into main