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