Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 99a157fa4ad174c4ff979414af2edb67a98eb9fe)