Merge "Remove unused ConnectivityAnnotations" into main