[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202603#2487

mssonicbld merged 2 commits into

Azure:202603Azure/sonic-buildimage-msft:202603from

mssonicbld:sonicbld/202603-mergemssonicbld/sonic-buildimage-msft:sonicbld/202603-mergeCopy head branch name to clipboard