(cherry picked from commit 0c42984de25e97e748e719dccfe3657fc4eb79f1) IJ-CR-15473 GitOrigin-RevId: 93090f9d81d14009120682796c11862dbe9e3e98