[code sync] Merge code from sonic-net/sonic-utilities:202405 to 202405#182

mssonicbld merged 2 commits into

Azure:202405Azure/sonic-utilities.msft:202405from

mssonicbld:sonicbld/202405-mergemssonicbld/sonic-utilities.msft:sonicbld/202405-mergeCopy head branch name to clipboard