Merge "Fix issue #37108191: CTS: ClipDataJobTest#testClipDataGrant failure" into oc-dev