[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202607#403

mssonicbld merged 2 commits into

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

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