(cherry picked from commit d9f0a2c91436adc73d3af3a5f8b29cdd0329b69b)

IJ-CR-21705

GitOrigin-RevId: 853135e1e31e1d56e7878b0e3538cce72cabc7aa