Merge "Snap for 4397478 from 53a9ccaa926945149b4546c67b50ce1ae88ba777 to oc-r4-release" into oc-r4-release