[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#538

mssonicbld merged 3 commits intoAzure:202305Azure/sonic-buildimage-msft:202305from

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