(cherry picked from commit 8063179464b8eb66696b397e05b336500c9e3aa6) IJ-MR-161542 GitOrigin-RevId: 21db1ce2ee2d6ea064ed5485be7397820e5e8a76