(cherry picked from commit a33c31e9758993fc2b8fb5c93e0a787fc2227a8d)

IJ-MR-124222

GitOrigin-RevId: 7579a30ccbaaa9607a4adb048d555e062d5c9b44