(cherry picked from commit 42efe6a20f52cfb3bd827a2b68d1fb6cc3949626) IJ-MR-5791 GitOrigin-RevId: e2a40572b0de4919a5049ff06e437b34d78c296c