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