(cherry picked from commit cd6abb8ad8a01b22066bed85639242b03a85d1d0) IJ-MR-8050 GitOrigin-RevId: f8a350835ce303c96b7f404263d8367242f4eaa6