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