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