(cherry picked from commit 7c656f571293ac1a4fc5e395341bc1a6576a4dda)

IJ-MR-107104

GitOrigin-RevId: 3e34e67bab9e9eb92261a466cd149c0750e066b8