(cherry picked from commit 8799a8df09cab8035524103061bd5d5b51543a7b) IJ-MR-168349 GitOrigin-RevId: ba6211c56ddccac6123ac2d3c16f7419f9a5360a