(cherry picked from commit 4a4d941b8af07721e0fb7cba4bf676ecc9d9c19d) IJ-MR-191087 GitOrigin-RevId: 0dd8a36d4e5a807f0ae065064f81a35f657b206e