Merge "Remove dependency on framework-connectivity-test-defaults" into main