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