Merge pull request #23150 from rmehta/fix-patch

fix(patch): fix patches for tests