(cherry picked from commit 95a5887af6ed5e39ec7c04c9f44cfe9a18ac3075)

IJ-MR-110732

GitOrigin-RevId: 1233137121732d14c25d3f290044a62db87ab5a4