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