(cherry picked from commit 4d23720720b6e3b401f3d00e4c0bf004e26f2b30)

IJ-CR-119610

GitOrigin-RevId: d6dd42899b33d13ddc2371c6dae7840a2d77a1b4