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