Merge pull request #23751 from arjantijms/6.x

No TCK on profile oss-release