(cherry picked from commit cf1ab39ff7ea44f835f52f5e9af0f3c9662d824a)

IJ-MR-108190

GitOrigin-RevId: 0ee3423786b0be0f1fb1101e9e15c09109b2c92d