Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit c75de8e33cc0db5236eef6146f2de06533b46aa8) Signed-off-by: Tibor Vass <tibor@docker.com>