weguo-NV

Hi @bingwang-ms , @mihirpat1 had approved the change, could you help merge it, thanks!

> conflicts with 202405 branch Hi @mssonicbld , I create PR #15417 to submit the same fix in **202405** branch, could you help review it?