Merge "Fix dependencies on connectivity_native lib" into main