[202012][PR: 14370][PR: 14433] Cherry pick conditional marks into 202012#14961

yutongzhang-microsoft wants to merge 2 commits intosonic-net:202012sonic-net/sonic-mgmt:202012from

yutongzhang-microsoft:yutongzhang/move_platform_202012yutongzhang-microsoft/sonic-mgmt:yutongzhang/move_platform_202012Copy head branch name to clipboard