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