Backport of https://github.com/Azure/sonic-buildimage/pull/4831 to the 201911 branch
Signed-off-by: Yong Zhao <yozhao@microsoft.com>