(cherry picked from commit 6db21da1efd2fdaba1e3dbc217bb619453a50cbc) IJ-MR-4788 GitOrigin-RevId: 7887f0ee01bc5d0e61e5279f8f5c20bb74696b9c