[cherry pick] #9523 Fix PR #9312 for KeyError and AttributeError in 202012#9590

yutongzhang-microsoft merged 1 commit intosonic-net:202012sonic-net/sonic-mgmt:202012from

yutongzhang-microsoft:yutongzhang/cherry_pick_9523_202012yutongzhang-microsoft/sonic-mgmt:yutongzhang/cherry_pick_9523_202012Copy head branch name to clipboard