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