(cherry picked from commit 9dd1de942ff78e9af66e54b69b397115057cc718) IJ-MR-10920 GitOrigin-RevId: ac2b5d214ab1613cd2d954b12c03e594efe69b50