[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202608#407

mssonicbld merged 2 commits into

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

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