[cherry pick] #9523 Fix PR #9312 for KeyError and AttributeError in 202305#9592

wangxin merged 2 commits intosonic-net:202305sonic-net/sonic-mgmt:202305from

yutongzhang-microsoft:yutongzhang/cherry_pick_9523_202305yutongzhang-microsoft/sonic-mgmt:yutongzhang/cherry_pick_9523_202305Copy head branch name to clipboard