auto cherry-pick 42 into 202111#43

liushilongbuaa merged 1 commit intoliushilongbuaa:202111liushilongbuaa/sonic-buildimage:202111from

mssonicbld:42-202111mssonicbld/sonic-buildimage:42-202111Copy head branch name to clipboard