Fix #24357 Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit 253933220965574422aa6679255359d8bd15d435) Signed-off-by: Tibor Vass <tibor@docker.com>