[code sync] Merge code from sonic-net/sonic-buildimage:202605 to 202608#2748

mssonicbld merged 2 commits into

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

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