(cherry picked from commit a33c31e9758993fc2b8fb5c93e0a787fc2227a8d)

IJ-MR-124222

GitOrigin-RevId: f7f2bf3e79812a042e6110b2b94ea194289de193