(cherry picked from commit 4d03313cce07e4c3ff4748328cf2e04ba74b8d91) IJ-MR-24242 GitOrigin-RevId: fa6c1b9077ef78b35c8f3453debcf06bcbc96364