Merge "Revert "Remove direct dependency from FrameworksCoreTestsRavenwood"" into main