(cherry picked from commit 8758ddf107d8bd9e028743ba8d9592f239d22bed) IJ-CR-160175 GitOrigin-RevId: ee245e671faae8a50e543b94791dccab660cc701