(cherry picked from commit d66fad2170e5c859fe056343738ec4b053a9d9d0)

IJ-MR-129844

GitOrigin-RevId: ac0a9d9b110845ab88f035ba3660a6fce2ead96d