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